From 5fa10cbc33564ab255687e0509a8c8677b394291 Mon Sep 17 00:00:00 2001
From: Freepolis <jiaye9553@gmail.com>
Date: Sat, 11 Mar 2017 13:57:55 +0800
Subject: [PATCH 01/14] test

---
 test.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 test.txt

diff --git a/test.txt b/test.txt
new file mode 100644
index 0000000..9d07aa0
--- /dev/null
+++ b/test.txt
@@ -0,0 +1 @@
+111
\ No newline at end of file

From 8502a77bfb5de1e4815aa9e27dfbfd605b0bebd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=8D=8E=E6=88=90?= <duhuacheng.ver@gmail.com>
Date: Sat, 11 Mar 2017 20:01:54 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8E=A7=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |   49 +
 src/main/java/com/entity/Car.java             |   13 +
 src/main/java/com/util/ResultMapUtil.java     |   38 +
 .../java/com/vm/controller/CarController.java |   60 +
 src/main/resources/spring-mvc.xml             |   39 +
 src/main/webapp/WEB-INF/view/admin/bottom.jsp |    3 +
 src/main/webapp/WEB-INF/view/admin/main.jsp   |    3 +
 src/main/webapp/WEB-INF/view/admin/nav.jsp    |   39 +-
 src/main/webapp/WEB-INF/view/vm/car/car.jsp   |    1 +
 src/main/webapp/WEB-INF/web.xml               |    4 +
 .../sweetalert/sweetalert-dev.js              | 1240 +++++++++++++++++
 .../sweetalert/sweetalert.css                 |  715 ++++++++++
 .../sweetalert/sweetalert.min.js              |    1 +
 src/main/webapp/js/ajaxfileupload.js          |  202 +++
 src/main/webapp/js/main.js                    |   47 +-
 src/main/webapp/template/car_tpl.xlsx         |  Bin 0 -> 9564 bytes
 16 files changed, 2447 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/com/util/ResultMapUtil.java
 create mode 100644 src/main/webapp/bower_components/sweetalert/sweetalert-dev.js
 create mode 100644 src/main/webapp/bower_components/sweetalert/sweetalert.css
 create mode 100644 src/main/webapp/bower_components/sweetalert/sweetalert.min.js
 create mode 100644 src/main/webapp/js/ajaxfileupload.js
 create mode 100644 src/main/webapp/template/car_tpl.xlsx

diff --git a/pom.xml b/pom.xml
index 49e749a..c7d1d28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,6 +13,8 @@
     <properties>
     	<spring.version>4.3.7.RELEASE</spring.version>
     	<shiro.version>1.4.0-RC2</shiro.version>
+    	<poi.version>3.15</poi.version>
+    	<jackson.version>2.8.7</jackson.version>
     </properties>
 
 	<repositories>
@@ -41,6 +43,33 @@
             <artifactId>hamcrest-core</artifactId>
             <version>1.3</version>
         </dependency>
+        
+        <!-- poi -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>${poi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-excelant</artifactId>
+            <version>${poi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>${poi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml-schemas</artifactId>
+            <version>${poi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-scratchpad</artifactId>
+            <version>${poi.version}</version>
+        </dependency>
 
         <!--shiro相关包-->
         <dependency>
@@ -255,6 +284,26 @@
             <artifactId>gson</artifactId>
             <version>2.6</version>
         </dependency>
+        <dependency>
+		    <groupId>com.alibaba</groupId>
+		    <artifactId>fastjson</artifactId>
+		    <version>1.2.17</version>
+		</dependency>
+        <!-- <dependency>
+		    <groupId>com.fasterxml.jackson.core</groupId>
+		    <artifactId>jackson-core</artifactId>
+		    <version>${jackson.version}</version>
+		</dependency>
+		<dependency>  
+		    <groupId>com.fasterxml.jackson.core</groupId>  
+		    <artifactId>jackson-databind</artifactId>  
+		    <version>${jackson.version}</version>  
+		</dependency>  
+		<dependency>  
+		    <groupId>com.fasterxml.jackson.core</groupId>  
+		    <artifactId>jackson-annotations</artifactId>  
+		    <version>${jackson.version}</version>  
+		</dependency>   -->
 
         <!--file upload-->
         <dependency>
diff --git a/src/main/java/com/entity/Car.java b/src/main/java/com/entity/Car.java
index 8f9c783..e85a764 100644
--- a/src/main/java/com/entity/Car.java
+++ b/src/main/java/com/entity/Car.java
@@ -20,6 +20,19 @@ public class Car implements Serializable{
 	@NotEmpty
     private Integer weight;
 	
+	public Car() {
+		super();
+	}
+	public Car(String carId,Boolean isSale, Integer high,
+			Integer length, Integer wide, Integer weight) {
+		super();
+		this.isSale = isSale;
+		this.carId = carId;
+		this.high = high;
+		this.length = length;
+		this.wide = wide;
+		this.weight = weight;
+	}
 	public Long getId() {
 		return id;
 	}
diff --git a/src/main/java/com/util/ResultMapUtil.java b/src/main/java/com/util/ResultMapUtil.java
new file mode 100644
index 0000000..1f70a44
--- /dev/null
+++ b/src/main/java/com/util/ResultMapUtil.java
@@ -0,0 +1,38 @@
+package com.util;
+
+import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
+
+import com.google.common.collect.Maps;
+
+public class ResultMapUtil {
+	public static Map<String,Object> getSuccessMap() {
+		return getSuccessMap(null,null);
+	}
+	public static Map<String,Object> getSuccessMap(String msg) {
+		return getSuccessMap(msg,null);
+	}
+	public static Map<String,Object> getSuccessMap(Object obj) {
+		return getSuccessMap(null,obj);
+	}
+	public static Map<String,Object> getSuccessMap(String msg,Object obj) {
+		Map<String,Object> map = Maps.newHashMap();
+		map.put("resultCode", 0);
+		if(!StringUtils.isEmpty(msg))
+			map.put("resultMsg", msg);
+		if(obj!=null)
+			map.put("data", obj);
+		return map;
+	}
+	public static Map<String,Object> getFailMap() {
+		return getFailMap(null);
+	}
+	public static Map<String,Object> getFailMap(String msg) {
+		Map<String,Object> map = Maps.newHashMap();
+		map.put("resultCode", -1);
+		if(!StringUtils.isEmpty(msg))
+			map.put("resultMsg", msg);
+		return map;
+	}
+}
diff --git a/src/main/java/com/vm/controller/CarController.java b/src/main/java/com/vm/controller/CarController.java
index b370350..39de28e 100644
--- a/src/main/java/com/vm/controller/CarController.java
+++ b/src/main/java/com/vm/controller/CarController.java
@@ -1,14 +1,31 @@
 package com.vm.controller;
 
+import java.io.IOException;
+import java.util.Map;
+
 import org.apache.log4j.Logger;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import com.entity.Car;
 import com.entity.Standard;
+import com.google.gson.JsonObject;
+import com.util.ResultMapUtil;
 import com.vm.service.CarBiz;
 import com.vm.service.StandardBiz;
 
@@ -64,5 +81,48 @@ public String delete(Long id) {
         carBiz.delete(id);
         return "redirect:/car.do/car.view";
     }
+    
+    @RequiresPermissions("car:delete")
+    @RequestMapping("test")
+    @ResponseBody
+    public Map<String,Object> test(@RequestBody String json) {
+        log.info(json.toString());
+        return ResultMapUtil.getSuccessMap("123");
+    }
+    
+    @SuppressWarnings("resource")
+	@RequiresPermissions("car:import")
+    @RequestMapping("import")
+    @ResponseBody
+    public Map<String,Object> imp(@RequestParam("file") CommonsMultipartFile file){
+    	Workbook wb = null;
+    	try {
+    		boolean isExcel2007 = file.getOriginalFilename().matches("^.+\\.(?i)(xlsx)$");  
+    		if(isExcel2007) {
+    			wb = new XSSFWorkbook(file.getInputStream());  
+    		} else {
+    			wb = new HSSFWorkbook(file.getInputStream());  
+    		}
+			Sheet sheet = wb.getSheetAt(0);   
+			int rowNum = sheet.getLastRowNum();
+			for(int i=1;i<=rowNum;i++) {
+				Row row = sheet.getRow(i);
+				String carId = row.getCell(0).getStringCellValue();
+				if(StringUtils.isEmpty(carId)) continue;
+				Boolean isSale = row.getCell(1).getBooleanCellValue();
+				Integer high = (int) row.getCell(2).getNumericCellValue();
+				Integer length = (int) row.getCell(3).getNumericCellValue();
+				Integer wide = (int) row.getCell(4).getNumericCellValue();
+				Integer weight = (int) row.getCell(5).getNumericCellValue();
+				
+				Car car = new Car(carId,isSale,high,length,wide,weight);
+				carBiz.add(car);
+			}
+		} catch (IOException e) {
+			log.error("上传文件解析失败",e);
+			return ResultMapUtil.getFailMap();
+		}
+    	return ResultMapUtil.getSuccessMap();
+    }
 
 }
diff --git a/src/main/resources/spring-mvc.xml b/src/main/resources/spring-mvc.xml
index 79a0001..df59dd6 100644
--- a/src/main/resources/spring-mvc.xml
+++ b/src/main/resources/spring-mvc.xml
@@ -33,6 +33,45 @@
         <property name="prefix" value="/WEB-INF/view/"/>
         <property name="suffix" value=".jsp"/>
     </bean>
+    
+    <!-- json解析 -->
+    <mvc:annotation-driven>
+        <mvc:message-converters register-defaults="true">
+            <!-- 避免IE执行AJAX时,返回JSON出现下载文件 -->
+            <bean id="fastJsonHttpMessageConverter" class="com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter">
+                <property name="supportedMediaTypes">
+                    <list>
+                        <value>application/json;charset=UTF-8</value>
+                        <value>text/html;charset=UTF-8</value>
+                        <value>text/plain;charset=UTF-8</value>
+                    </list>
+                </property>
+            </bean>
+        </mvc:message-converters>
+    </mvc:annotation-driven>
+    <!-- <bean class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping" />
+    <bean class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter">
+       <property name="messageConverters">
+           <list>
+               <bean class="org.springframework.http.converter.StringHttpMessageConverter">
+                   <property name="supportedMediaTypes">
+                       <list>
+                           <value>text/html; charset=UTF-8</value>
+                           <value>application/json;charset=UTF-8</value>
+                       </list>
+                   </property>
+               </bean>
+               <bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
+                   <property name="supportedMediaTypes">
+                       <list>
+                           <value>text/html; charset=UTF-8</value>
+                           <value>application/json;charset=UTF-8</value>
+                       </list>
+                   </property>
+               </bean>
+           </list>
+       </property>
+  	</bean> -->
 
     <!--多部分解析器,用于解析文件上传时context-type为-->
     <!--Content-Type:multipart/form-data; boundary=...的情况-->
diff --git a/src/main/webapp/WEB-INF/view/admin/bottom.jsp b/src/main/webapp/WEB-INF/view/admin/bottom.jsp
index 954c032..d671593 100644
--- a/src/main/webapp/WEB-INF/view/admin/bottom.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/bottom.jsp
@@ -20,8 +20,11 @@
 <script src="${pageContext.request.contextPath}/bower_components/bootstrap-select-master/dist/js/bootstrap-select.min.js"></script>
 <script src="${pageContext.request.contextPath}/bower_components/bootstrap-select-master/dist/js/i18n/defaults-zh_CN.min.js"></script>
 
+<script src="${pageContext.request.contextPath}/bower_components/sweetalert/sweetalert.min.js"></script>
+
 
 <script src="${pageContext.request.contextPath}/js/jquery.nicescroll.min.js"></script>
+<script src="${pageContext.request.contextPath}/js/ajaxfileupload.js"></script>
 <script src="${pageContext.request.contextPath}/js/main.js"></script>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/view/admin/main.jsp b/src/main/webapp/WEB-INF/view/admin/main.jsp
index a21c6de..fc34ce2 100644
--- a/src/main/webapp/WEB-INF/view/admin/main.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/main.jsp
@@ -1,5 +1,7 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+
+<div id="wrapper">
 <jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
 
 <!-- Page Content -->
@@ -109,3 +111,4 @@
 </div>
 <!-- /#wrapper -->
 <jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
+</div>
diff --git a/src/main/webapp/WEB-INF/view/admin/nav.jsp b/src/main/webapp/WEB-INF/view/admin/nav.jsp
index f609c1f..2774bd2 100644
--- a/src/main/webapp/WEB-INF/view/admin/nav.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/nav.jsp
@@ -34,7 +34,11 @@
           
     <link href="${pageContext.request.contextPath}/bower_components/bootstrap-select-master/dist/css/bootstrap-select.min.css"
           rel="stylesheet" type="text/css">
-
+          
+    <link href="${pageContext.request.contextPath}/bower_components/sweetalert/sweetalert.css"
+          rel="stylesheet" type="text/css">
+          
+          
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you util the page via file:// -->
     <!--[if lt IE 9]>
@@ -50,9 +54,6 @@
 	</style>
 </head>
 <body>
-
-<div id="wrapper">
-
     <!-- Navigation -->
     <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
         <div class="navbar-header">
@@ -125,4 +126,32 @@
             <!-- /.sidebar-collapse -->
         </div>
         <!-- /.navbar-static-side -->
-    </nav>
\ No newline at end of file
+    </nav>
+    
+    <div class="modal fade" id="uploadModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+						&times;
+					</button>
+					<h4 class="modal-title" id="myModalLabel">
+						批量上传
+					</h4>
+				</div>
+				<div class="modal-body">
+					<form id="uploadForm" role="form" class="form-inline">
+						<div class="form-group">
+						    <label class="sr-only" for="file">文件输入</label>
+    						<input type="file" id="file" name="file">
+					  	</div>
+   						<button type="submit" class="btn btn-default">上传</button>
+   						<a class="btn btn-default hidden modaldownBtn">模板下载</a>
+					</form>
+				</div>
+				<div class="modal-footer">
+					<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+				</div>
+			</div><!-- /.modal-content -->
+		</div><!-- /.modal -->
+	</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/view/vm/car/car.jsp b/src/main/webapp/WEB-INF/view/vm/car/car.jsp
index 6b009d9..4af74c9 100644
--- a/src/main/webapp/WEB-INF/view/vm/car/car.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/car/car.jsp
@@ -85,6 +85,7 @@
                                 </tbody>
                             </table>
                             <a href="${pageContext.request.contextPath}/car.do/car_add.view" class="btn btn-primary" role="button">添加车辆</a>
+                            <button class="btn btn-primary" onclick="uploader.uploadModal('${pageContext.request.contextPath}/car.do/import','${pageContext.request.contextPath}/template/car_tpl.xlsx')">批量上传</button>
                         </div>
                         <!-- /.table-responsive -->
                     </div>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 7844f93..68e2771 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -25,6 +25,10 @@
         <servlet-name>default</servlet-name>
         <url-pattern>*.jpg</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>default</servlet-name>
+        <url-pattern>*.xlsx</url-pattern>
+    </servlet-mapping>
     <servlet-mapping>
         <servlet-name>default</servlet-name>
         <url-pattern>*.lang</url-pattern>
diff --git a/src/main/webapp/bower_components/sweetalert/sweetalert-dev.js b/src/main/webapp/bower_components/sweetalert/sweetalert-dev.js
new file mode 100644
index 0000000..9198f2f
--- /dev/null
+++ b/src/main/webapp/bower_components/sweetalert/sweetalert-dev.js
@@ -0,0 +1,1240 @@
+;(function(window, document, undefined) {
+  "use strict";
+  
+  (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+'use strict';
+
+var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
+
+// SweetAlert
+// 2014-2015 (c) - Tristan Edwards
+// github.com/t4t5/sweetalert
+
+/*
+ * jQuery-like functions for manipulating the DOM
+ */
+
+var _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide$isDescendant$getTopMargin$fadeIn$fadeOut$fireClick$stopEventPropagation = require('./modules/handle-dom');
+
+/*
+ * Handy utilities
+ */
+
+var _extend$hexToRgb$isIE8$logStr$colorLuminance = require('./modules/utils');
+
+/*
+ *  Handle sweetAlert's DOM elements
+ */
+
+var _sweetAlertInitialize$getModal$getOverlay$getInput$setFocusStyle$openModal$resetInput$fixVerticalPosition = require('./modules/handle-swal-dom');
+
+// Handle button events and keyboard events
+
+var _handleButton$handleConfirm$handleCancel = require('./modules/handle-click');
+
+var _handleKeyDown = require('./modules/handle-key');
+
+var _handleKeyDown2 = _interopRequireWildcard(_handleKeyDown);
+
+// Default values
+
+var _defaultParams = require('./modules/default-params');
+
+var _defaultParams2 = _interopRequireWildcard(_defaultParams);
+
+var _setParameters = require('./modules/set-params');
+
+var _setParameters2 = _interopRequireWildcard(_setParameters);
+
+/*
+ * Remember state in cases where opening and handling a modal will fiddle with it.
+ * (We also use window.previousActiveElement as a global variable)
+ */
+var previousWindowKeyDown;
+var lastFocusedButton;
+
+/*
+ * Global sweetAlert function
+ * (this is what the user calls)
+ */
+var sweetAlert, swal;
+
+sweetAlert = swal = function () {
+  var customizations = arguments[0];
+
+  _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide$isDescendant$getTopMargin$fadeIn$fadeOut$fireClick$stopEventPropagation.addClass(document.body, 'stop-scrolling');
+  _sweetAlertInitialize$getModal$getOverlay$getInput$setFocusStyle$openModal$resetInput$fixVerticalPosition.resetInput();
+
+  /*
+   * Use argument if defined or default value from params object otherwise.
+   * Supports the case where a default value is boolean true and should be
+   * overridden by a corresponding explicit argument which is boolean false.
+   */
+  function argumentOrDefault(key) {
+    var args = customizations;
+    return args[key] === undefined ? _defaultParams2['default'][key] : args[key];
+  }
+
+  if (customizations === undefined) {
+    _extend$hexToRgb$isIE8$logStr$colorLuminance.logStr('SweetAlert expects at least 1 attribute!');
+    return false;
+  }
+
+  var params = _extend$hexToRgb$isIE8$logStr$colorLuminance.extend({}, _defaultParams2['default']);
+
+  switch (typeof customizations) {
+
+    // Ex: swal("Hello", "Just testing", "info");
+    case 'string':
+      params.title = customizations;
+      params.text = arguments[1] || '';
+      params.type = arguments[2] || '';
+      break;
+
+    // Ex: swal({ title:"Hello", text: "Just testing", type: "info" });
+    case 'object':
+      if (customizations.title === undefined) {
+        _extend$hexToRgb$isIE8$logStr$colorLuminance.logStr('Missing "title" argument!');
+        return false;
+      }
+
+      params.title = customizations.title;
+
+      for (var customName in _defaultParams2['default']) {
+        params[customName] = argumentOrDefault(customName);
+      }
+
+      // Show "Confirm" instead of "OK" if cancel button is visible
+      params.confirmButtonText = params.showCancelButton ? 'Confirm' : _defaultParams2['default'].confirmButtonText;
+      params.confirmButtonText = argumentOrDefault('confirmButtonText');
+
+      // Callback function when clicking on "OK"/"Cancel"
+      params.doneFunction = arguments[1] || null;
+
+      break;
+
+    default:
+      _extend$hexToRgb$isIE8$logStr$colorLuminance.logStr('Unexpected type of argument! Expected "string" or "object", got ' + typeof customizations);
+      return false;
+
+  }
+
+  _setParameters2['default'](params);
+  _sweetAlertInitialize$getModal$getOverlay$getInput$setFocusStyle$openModal$resetInput$fixVerticalPosition.fixVerticalPosition();
+  _sweetAlertInitialize$getModal$getOverlay$getInput$setFocusStyle$openModal$resetInput$fixVerticalPosition.openModal(arguments[1]);
+
+  // Modal interactions
+  var modal = _sweetAlertInitialize$getModal$getOverlay$getInput$setFocusStyle$openModal$resetInput$fixVerticalPosition.getModal();
+
+  /* 
+   * Make sure all modal buttons respond to all events
+   */
+  var $buttons = modal.querySelectorAll('button');
+  var buttonEvents = ['onclick', 'onmouseover', 'onmouseout', 'onmousedown', 'onmouseup', 'onfocus'];
+  var onButtonEvent = function onButtonEvent(e) {
+    return _handleButton$handleConfirm$handleCancel.handleButton(e, params, modal);
+  };
+
+  for (var btnIndex = 0; btnIndex < $buttons.length; btnIndex++) {
+    for (var evtIndex = 0; evtIndex < buttonEvents.length; evtIndex++) {
+      var btnEvt = buttonEvents[evtIndex];
+      $buttons[btnIndex][btnEvt] = onButtonEvent;
+    }
+  }
+
+  // Clicking outside the modal dismisses it (if allowed by user)
+  _sweetAlertInitialize$getModal$getOverlay$getInput$setFocusStyle$openModal$resetInput$fixVerticalPosition.getOverlay().onclick = onButtonEvent;
+
+  previousWindowKeyDown = window.onkeydown;
+
+  var onKeyEvent = function onKeyEvent(e) {
+    return _handleKeyDown2['default'](e, params, modal);
+  };
+  window.onkeydown = onKeyEvent;
+
+  window.onfocus = function () {
+    // When the user has focused away and focused back from the whole window.
+    setTimeout(function () {
+      // Put in a timeout to jump out of the event sequence.
+      // Calling focus() in the event sequence confuses things.
+      if (lastFocusedButton !== undefined) {
+        lastFocusedButton.focus();
+        lastFocusedButton = undefined;
+      }
+    }, 0);
+  };
+};
+
+/*
+ * Set default params for each popup
+ * @param {Object} userParams
+ */
+sweetAlert.setDefaults = swal.setDefaults = function (userParams) {
+  if (!userParams) {
+    throw new Error('userParams is required');
+  }
+  if (typeof userParams !== 'object') {
+    throw new Error('userParams has to be a object');
+  }
+
+  _extend$hexToRgb$isIE8$logStr$colorLuminance.extend(_defaultParams2['default'], userParams);
+};
+
+/*
+ * Animation when closing modal
+ */
+sweetAlert.close = swal.close = function () {
+  var modal = _sweetAlertInitialize$getModal$getOverlay$getInput$setFocusStyle$openModal$resetInput$fixVerticalPosition.getModal();
+
+  _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide$isDescendant$getTopMargin$fadeIn$fadeOut$fireClick$stopEventPropagation.fadeOut(_sweetAlertInitialize$getModal$getOverlay$getInput$setFocusStyle$openModal$resetInput$fixVerticalPosition.getOverlay(), 5);
+  _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide$isDescendant$getTopMargin$fadeIn$fadeOut$fireClick$stopEventPropagation.fadeOut(modal, 5);
+  _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide$isDescendant$getTopMargin$fadeIn$fadeOut$fireClick$stopEventPropagation.removeClass(modal, 'showSweetAlert');
+  _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide$isDescendant$getTopMargin$fadeIn$fadeOut$fireClick$stopEventPropagation.addClass(modal, 'hideSweetAlert');
+  _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide$isDescendant$getTopMargin$fadeIn$fadeOut$fireClick$stopEventPropagation.removeClass(modal, 'visible');
+
+  /*
+   * Reset icon animations
+   */
+  var $successIcon = modal.querySelector('.sa-icon.sa-success');
+  _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide$isDescendant$getTopMargin$fadeIn$fadeOut$fireClick$stopEventPropagation.removeClass($successIcon, 'animate');
+  _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide$isDescendant$getTopMargin$fadeIn$fadeOut$fireClick$stopEventPropagation.removeClass($successIcon.querySelector('.sa-tip'), 'animateSuccessTip');
+  _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide$isDescendant$getTopMargin$fadeIn$fadeOut$fireClick$stopEventPropagation.removeClass($successIcon.querySelector('.sa-long'), 'animateSuccessLong');
+
+  var $errorIcon = modal.querySelector('.sa-icon.sa-error');
+  _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide$isDescendant$getTopMargin$fadeIn$fadeOut$fireClick$stopEventPropagation.removeClass($errorIcon, 'animateErrorIcon');
+  _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide$isDescendant$getTopMargin$fadeIn$fadeOut$fireClick$stopEventPropagation.removeClass($errorIcon.querySelector('.sa-x-mark'), 'animateXMark');
+
+  var $warningIcon = modal.querySelector('.sa-icon.sa-warning');
+  _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide$isDescendant$getTopMargin$fadeIn$fadeOut$fireClick$stopEventPropagation.removeClass($warningIcon, 'pulseWarning');
+  _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide$isDescendant$getTopMargin$fadeIn$fadeOut$fireClick$stopEventPropagation.removeClass($warningIcon.querySelector('.sa-body'), 'pulseWarningIns');
+  _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide$isDescendant$getTopMargin$fadeIn$fadeOut$fireClick$stopEventPropagation.removeClass($warningIcon.querySelector('.sa-dot'), 'pulseWarningIns');
+
+  // Reset custom class (delay so that UI changes aren't visible)
+  setTimeout(function () {
+    var customClass = modal.getAttribute('data-custom-class');
+    _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide$isDescendant$getTopMargin$fadeIn$fadeOut$fireClick$stopEventPropagation.removeClass(modal, customClass);
+  }, 300);
+
+  // Make page scrollable again
+  _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide$isDescendant$getTopMargin$fadeIn$fadeOut$fireClick$stopEventPropagation.removeClass(document.body, 'stop-scrolling');
+
+  // Reset the page to its previous state
+  window.onkeydown = previousWindowKeyDown;
+  if (window.previousActiveElement) {
+    window.previousActiveElement.focus();
+  }
+  lastFocusedButton = undefined;
+  clearTimeout(modal.timeout);
+
+  return true;
+};
+
+/*
+ * Validation of the input field is done by user
+ * If something is wrong => call showInputError with errorMessage
+ */
+sweetAlert.showInputError = swal.showInputError = function (errorMessage) {
+  var modal = _sweetAlertInitialize$getModal$getOverlay$getInput$setFocusStyle$openModal$resetInput$fixVerticalPosition.getModal();
+
+  var $errorIcon = modal.querySelector('.sa-input-error');
+  _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide$isDescendant$getTopMargin$fadeIn$fadeOut$fireClick$stopEventPropagation.addClass($errorIcon, 'show');
+
+  var $errorContainer = modal.querySelector('.sa-error-container');
+  _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide$isDescendant$getTopMargin$fadeIn$fadeOut$fireClick$stopEventPropagation.addClass($errorContainer, 'show');
+
+  $errorContainer.querySelector('p').innerHTML = errorMessage;
+
+  modal.querySelector('input').focus();
+};
+
+/*
+ * Reset input error DOM elements
+ */
+sweetAlert.resetInputError = swal.resetInputError = function (event) {
+  // If press enter => ignore
+  if (event && event.keyCode === 13) {
+    return false;
+  }
+
+  var $modal = _sweetAlertInitialize$getModal$getOverlay$getInput$setFocusStyle$openModal$resetInput$fixVerticalPosition.getModal();
+
+  var $errorIcon = $modal.querySelector('.sa-input-error');
+  _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide$isDescendant$getTopMargin$fadeIn$fadeOut$fireClick$stopEventPropagation.removeClass($errorIcon, 'show');
+
+  var $errorContainer = $modal.querySelector('.sa-error-container');
+  _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide$isDescendant$getTopMargin$fadeIn$fadeOut$fireClick$stopEventPropagation.removeClass($errorContainer, 'show');
+};
+
+if (typeof window !== 'undefined') {
+  // The 'handle-click' module requires
+  // that 'sweetAlert' was set as global.
+  window.sweetAlert = window.swal = sweetAlert;
+} else {
+  _extend$hexToRgb$isIE8$logStr$colorLuminance.logStr('SweetAlert is a frontend module!');
+}
+
+},{"./modules/default-params":2,"./modules/handle-click":3,"./modules/handle-dom":4,"./modules/handle-key":5,"./modules/handle-swal-dom":6,"./modules/set-params":8,"./modules/utils":9}],2:[function(require,module,exports){
+'use strict';
+
+Object.defineProperty(exports, '__esModule', {
+  value: true
+});
+var defaultParams = {
+  title: '',
+  text: '',
+  type: null,
+  allowOutsideClick: false,
+  showConfirmButton: true,
+  showCancelButton: false,
+  closeOnConfirm: true,
+  closeOnCancel: true,
+  confirmButtonText: 'OK',
+  confirmButtonColor: '#AEDEF4',
+  cancelButtonText: 'Cancel',
+  imageUrl: null,
+  imageSize: null,
+  timer: null,
+  customClass: '',
+  html: false,
+  animation: true,
+  allowEscapeKey: true,
+  inputType: 'text',
+  inputPlaceholder: '',
+  inputValue: ''
+};
+
+exports['default'] = defaultParams;
+module.exports = exports['default'];
+
+},{}],3:[function(require,module,exports){
+'use strict';
+
+Object.defineProperty(exports, '__esModule', {
+  value: true
+});
+
+var _colorLuminance = require('./utils');
+
+var _getModal = require('./handle-swal-dom');
+
+var _hasClass$isDescendant = require('./handle-dom');
+
+/*
+ * User clicked on "Confirm"/"OK" or "Cancel"
+ */
+var handleButton = function handleButton(event, params, modal) {
+  var e = event || window.event;
+  var target = e.target || e.srcElement;
+
+  var targetedConfirm = target.className.indexOf('confirm') !== -1;
+  var targetedOverlay = target.className.indexOf('sweet-overlay') !== -1;
+  var modalIsVisible = _hasClass$isDescendant.hasClass(modal, 'visible');
+  var doneFunctionExists = params.doneFunction && modal.getAttribute('data-has-done-function') === 'true';
+
+  // Since the user can change the background-color of the confirm button programmatically,
+  // we must calculate what the color should be on hover/active
+  var normalColor, hoverColor, activeColor;
+  if (targetedConfirm && params.confirmButtonColor) {
+    normalColor = params.confirmButtonColor;
+    hoverColor = _colorLuminance.colorLuminance(normalColor, -0.04);
+    activeColor = _colorLuminance.colorLuminance(normalColor, -0.14);
+  }
+
+  function shouldSetConfirmButtonColor(color) {
+    if (targetedConfirm && params.confirmButtonColor) {
+      target.style.backgroundColor = color;
+    }
+  }
+
+  switch (e.type) {
+    case 'mouseover':
+      shouldSetConfirmButtonColor(hoverColor);
+      break;
+
+    case 'mouseout':
+      shouldSetConfirmButtonColor(normalColor);
+      break;
+
+    case 'mousedown':
+      shouldSetConfirmButtonColor(activeColor);
+      break;
+
+    case 'mouseup':
+      shouldSetConfirmButtonColor(hoverColor);
+      break;
+
+    case 'focus':
+      var $confirmButton = modal.querySelector('button.confirm');
+      var $cancelButton = modal.querySelector('button.cancel');
+
+      if (targetedConfirm) {
+        $cancelButton.style.boxShadow = 'none';
+      } else {
+        $confirmButton.style.boxShadow = 'none';
+      }
+      break;
+
+    case 'click':
+      var clickedOnModal = modal === target;
+      var clickedOnModalChild = _hasClass$isDescendant.isDescendant(modal, target);
+
+      // Ignore click outside if allowOutsideClick is false
+      if (!clickedOnModal && !clickedOnModalChild && modalIsVisible && !params.allowOutsideClick) {
+        break;
+      }
+
+      if (targetedConfirm && doneFunctionExists && modalIsVisible) {
+        handleConfirm(modal, params);
+      } else if (doneFunctionExists && modalIsVisible || targetedOverlay) {
+        handleCancel(modal, params);
+      } else if (_hasClass$isDescendant.isDescendant(modal, target) && target.tagName === 'BUTTON') {
+        sweetAlert.close();
+      }
+      break;
+  }
+};
+
+/*
+ *  User clicked on "Confirm"/"OK"
+ */
+var handleConfirm = function handleConfirm(modal, params) {
+  var callbackValue = true;
+
+  if (_hasClass$isDescendant.hasClass(modal, 'show-input')) {
+    callbackValue = modal.querySelector('input').value;
+
+    if (!callbackValue) {
+      callbackValue = '';
+    }
+  }
+
+  params.doneFunction(callbackValue);
+
+  if (params.closeOnConfirm) {
+    sweetAlert.close();
+  }
+};
+
+/*
+ *  User clicked on "Cancel"
+ */
+var handleCancel = function handleCancel(modal, params) {
+  // Check if callback function expects a parameter (to track cancel actions)
+  var functionAsStr = String(params.doneFunction).replace(/\s/g, '');
+  var functionHandlesCancel = functionAsStr.substring(0, 9) === 'function(' && functionAsStr.substring(9, 10) !== ')';
+
+  if (functionHandlesCancel) {
+    params.doneFunction(false);
+  }
+
+  if (params.closeOnCancel) {
+    sweetAlert.close();
+  }
+};
+
+exports['default'] = {
+  handleButton: handleButton,
+  handleConfirm: handleConfirm,
+  handleCancel: handleCancel
+};
+module.exports = exports['default'];
+
+},{"./handle-dom":4,"./handle-swal-dom":6,"./utils":9}],4:[function(require,module,exports){
+'use strict';
+
+Object.defineProperty(exports, '__esModule', {
+  value: true
+});
+var hasClass = function hasClass(elem, className) {
+  return new RegExp(' ' + className + ' ').test(' ' + elem.className + ' ');
+};
+
+var addClass = function addClass(elem, className) {
+  if (!hasClass(elem, className)) {
+    elem.className += ' ' + className;
+  }
+};
+
+var removeClass = function removeClass(elem, className) {
+  var newClass = ' ' + elem.className.replace(/[\t\r\n]/g, ' ') + ' ';
+  if (hasClass(elem, className)) {
+    while (newClass.indexOf(' ' + className + ' ') >= 0) {
+      newClass = newClass.replace(' ' + className + ' ', ' ');
+    }
+    elem.className = newClass.replace(/^\s+|\s+$/g, '');
+  }
+};
+
+var escapeHtml = function escapeHtml(str) {
+  var div = document.createElement('div');
+  div.appendChild(document.createTextNode(str));
+  return div.innerHTML;
+};
+
+var _show = function _show(elem) {
+  elem.style.opacity = '';
+  elem.style.display = 'block';
+};
+
+var show = function show(elems) {
+  if (elems && !elems.length) {
+    return _show(elems);
+  }
+  for (var i = 0; i < elems.length; ++i) {
+    _show(elems[i]);
+  }
+};
+
+var _hide = function _hide(elem) {
+  elem.style.opacity = '';
+  elem.style.display = 'none';
+};
+
+var hide = function hide(elems) {
+  if (elems && !elems.length) {
+    return _hide(elems);
+  }
+  for (var i = 0; i < elems.length; ++i) {
+    _hide(elems[i]);
+  }
+};
+
+var isDescendant = function isDescendant(parent, child) {
+  var node = child.parentNode;
+  while (node !== null) {
+    if (node === parent) {
+      return true;
+    }
+    node = node.parentNode;
+  }
+  return false;
+};
+
+var getTopMargin = function getTopMargin(elem) {
+  elem.style.left = '-9999px';
+  elem.style.display = 'block';
+
+  var height = elem.clientHeight,
+      padding;
+  if (typeof getComputedStyle !== 'undefined') {
+    // IE 8
+    padding = parseInt(getComputedStyle(elem).getPropertyValue('padding-top'), 10);
+  } else {
+    padding = parseInt(elem.currentStyle.padding);
+  }
+
+  elem.style.left = '';
+  elem.style.display = 'none';
+  return '-' + parseInt((height + padding) / 2) + 'px';
+};
+
+var fadeIn = function fadeIn(elem, interval) {
+  if (+elem.style.opacity < 1) {
+    interval = interval || 16;
+    elem.style.opacity = 0;
+    elem.style.display = 'block';
+    var last = +new Date();
+    var tick = (function (_tick) {
+      function tick() {
+        return _tick.apply(this, arguments);
+      }
+
+      tick.toString = function () {
+        return _tick.toString();
+      };
+
+      return tick;
+    })(function () {
+      elem.style.opacity = +elem.style.opacity + (new Date() - last) / 100;
+      last = +new Date();
+
+      if (+elem.style.opacity < 1) {
+        setTimeout(tick, interval);
+      }
+    });
+    tick();
+  }
+  elem.style.display = 'block'; //fallback IE8
+};
+
+var fadeOut = function fadeOut(elem, interval) {
+  interval = interval || 16;
+  elem.style.opacity = 1;
+  var last = +new Date();
+  var tick = (function (_tick2) {
+    function tick() {
+      return _tick2.apply(this, arguments);
+    }
+
+    tick.toString = function () {
+      return _tick2.toString();
+    };
+
+    return tick;
+  })(function () {
+    elem.style.opacity = +elem.style.opacity - (new Date() - last) / 100;
+    last = +new Date();
+
+    if (+elem.style.opacity > 0) {
+      setTimeout(tick, interval);
+    } else {
+      elem.style.display = 'none';
+    }
+  });
+  tick();
+};
+
+var fireClick = function fireClick(node) {
+  // Taken from http://www.nonobtrusive.com/2011/11/29/programatically-fire-crossbrowser-click-event-with-javascript/
+  // Then fixed for today's Chrome browser.
+  if (typeof MouseEvent === 'function') {
+    // Up-to-date approach
+    var mevt = new MouseEvent('click', {
+      view: window,
+      bubbles: false,
+      cancelable: true
+    });
+    node.dispatchEvent(mevt);
+  } else if (document.createEvent) {
+    // Fallback
+    var evt = document.createEvent('MouseEvents');
+    evt.initEvent('click', false, false);
+    node.dispatchEvent(evt);
+  } else if (document.createEventObject) {
+    node.fireEvent('onclick');
+  } else if (typeof node.onclick === 'function') {
+    node.onclick();
+  }
+};
+
+var stopEventPropagation = function stopEventPropagation(e) {
+  // In particular, make sure the space bar doesn't scroll the main window.
+  if (typeof e.stopPropagation === 'function') {
+    e.stopPropagation();
+    e.preventDefault();
+  } else if (window.event && window.event.hasOwnProperty('cancelBubble')) {
+    window.event.cancelBubble = true;
+  }
+};
+
+exports.hasClass = hasClass;
+exports.addClass = addClass;
+exports.removeClass = removeClass;
+exports.escapeHtml = escapeHtml;
+exports._show = _show;
+exports.show = show;
+exports._hide = _hide;
+exports.hide = hide;
+exports.isDescendant = isDescendant;
+exports.getTopMargin = getTopMargin;
+exports.fadeIn = fadeIn;
+exports.fadeOut = fadeOut;
+exports.fireClick = fireClick;
+exports.stopEventPropagation = stopEventPropagation;
+
+},{}],5:[function(require,module,exports){
+'use strict';
+
+Object.defineProperty(exports, '__esModule', {
+  value: true
+});
+
+var _stopEventPropagation$fireClick = require('./handle-dom');
+
+var _setFocusStyle = require('./handle-swal-dom');
+
+var handleKeyDown = function handleKeyDown(event, params, modal) {
+  var e = event || window.event;
+  var keyCode = e.keyCode || e.which;
+
+  var $okButton = modal.querySelector('button.confirm');
+  var $cancelButton = modal.querySelector('button.cancel');
+  var $modalButtons = modal.querySelectorAll('button[tabindex]');
+
+  if ([9, 13, 32, 27].indexOf(keyCode) === -1) {
+    // Don't do work on keys we don't care about.
+    return;
+  }
+
+  var $targetElement = e.target || e.srcElement;
+
+  var btnIndex = -1; // Find the button - note, this is a nodelist, not an array.
+  for (var i = 0; i < $modalButtons.length; i++) {
+    if ($targetElement === $modalButtons[i]) {
+      btnIndex = i;
+      break;
+    }
+  }
+
+  if (keyCode === 9) {
+    // TAB
+    if (btnIndex === -1) {
+      // No button focused. Jump to the confirm button.
+      $targetElement = $okButton;
+    } else {
+      // Cycle to the next button
+      if (btnIndex === $modalButtons.length - 1) {
+        $targetElement = $modalButtons[0];
+      } else {
+        $targetElement = $modalButtons[btnIndex + 1];
+      }
+    }
+
+    _stopEventPropagation$fireClick.stopEventPropagation(e);
+    $targetElement.focus();
+
+    if (params.confirmButtonColor) {
+      _setFocusStyle.setFocusStyle($targetElement, params.confirmButtonColor);
+    }
+  } else {
+    if (keyCode === 13) {
+      if ($targetElement.tagName === 'INPUT') {
+        $targetElement = $okButton;
+        $okButton.focus();
+      }
+
+      if (btnIndex === -1) {
+        // ENTER/SPACE clicked outside of a button.
+        $targetElement = $okButton;
+      } else {
+        // Do nothing - let the browser handle it.
+        $targetElement = undefined;
+      }
+    } else if (keyCode === 27 && params.allowEscapeKey === true) {
+      $targetElement = $cancelButton;
+      _stopEventPropagation$fireClick.fireClick($targetElement, e);
+    } else {
+      // Fallback - let the browser handle it.
+      $targetElement = undefined;
+    }
+  }
+};
+
+exports['default'] = handleKeyDown;
+module.exports = exports['default'];
+
+},{"./handle-dom":4,"./handle-swal-dom":6}],6:[function(require,module,exports){
+'use strict';
+
+var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
+
+Object.defineProperty(exports, '__esModule', {
+  value: true
+});
+
+var _hexToRgb = require('./utils');
+
+var _removeClass$getTopMargin$fadeIn$show$addClass = require('./handle-dom');
+
+var _defaultParams = require('./default-params');
+
+var _defaultParams2 = _interopRequireWildcard(_defaultParams);
+
+/*
+ * Add modal + overlay to DOM
+ */
+
+var _injectedHTML = require('./injected-html');
+
+var _injectedHTML2 = _interopRequireWildcard(_injectedHTML);
+
+var modalClass = '.sweet-alert';
+var overlayClass = '.sweet-overlay';
+
+var sweetAlertInitialize = function sweetAlertInitialize() {
+  var sweetWrap = document.createElement('div');
+  sweetWrap.innerHTML = _injectedHTML2['default'];
+
+  // Append elements to body
+  while (sweetWrap.firstChild) {
+    document.body.appendChild(sweetWrap.firstChild);
+  }
+};
+
+/*
+ * Get DOM element of modal
+ */
+var getModal = (function (_getModal) {
+  function getModal() {
+    return _getModal.apply(this, arguments);
+  }
+
+  getModal.toString = function () {
+    return _getModal.toString();
+  };
+
+  return getModal;
+})(function () {
+  var $modal = document.querySelector(modalClass);
+
+  if (!$modal) {
+    sweetAlertInitialize();
+    $modal = getModal();
+  }
+
+  return $modal;
+});
+
+/*
+ * Get DOM element of input (in modal)
+ */
+var getInput = function getInput() {
+  var $modal = getModal();
+  if ($modal) {
+    return $modal.querySelector('input');
+  }
+};
+
+/*
+ * Get DOM element of overlay
+ */
+var getOverlay = function getOverlay() {
+  return document.querySelector(overlayClass);
+};
+
+/*
+ * Add box-shadow style to button (depending on its chosen bg-color)
+ */
+var setFocusStyle = function setFocusStyle($button, bgColor) {
+  var rgbColor = _hexToRgb.hexToRgb(bgColor);
+  $button.style.boxShadow = '0 0 2px rgba(' + rgbColor + ', 0.8), inset 0 0 0 1px rgba(0, 0, 0, 0.05)';
+};
+
+/*
+ * Animation when opening modal
+ */
+var openModal = function openModal(callback) {
+  var $modal = getModal();
+  _removeClass$getTopMargin$fadeIn$show$addClass.fadeIn(getOverlay(), 10);
+  _removeClass$getTopMargin$fadeIn$show$addClass.show($modal);
+  _removeClass$getTopMargin$fadeIn$show$addClass.addClass($modal, 'showSweetAlert');
+  _removeClass$getTopMargin$fadeIn$show$addClass.removeClass($modal, 'hideSweetAlert');
+
+  window.previousActiveElement = document.activeElement;
+  var $okButton = $modal.querySelector('button.confirm');
+  $okButton.focus();
+
+  setTimeout(function () {
+    _removeClass$getTopMargin$fadeIn$show$addClass.addClass($modal, 'visible');
+  }, 500);
+
+  var timer = $modal.getAttribute('data-timer');
+
+  if (timer !== 'null' && timer !== '') {
+    var timerCallback = callback;
+    $modal.timeout = setTimeout(function () {
+      var doneFunctionExists = (timerCallback || null) && $modal.getAttribute('data-has-done-function') === 'true';
+      if (doneFunctionExists) {
+        timerCallback(null);
+      } else {
+        sweetAlert.close();
+      }
+    }, timer);
+  }
+};
+
+/*
+ * Reset the styling of the input
+ * (for example if errors have been shown)
+ */
+var resetInput = function resetInput() {
+  var $modal = getModal();
+  var $input = getInput();
+
+  _removeClass$getTopMargin$fadeIn$show$addClass.removeClass($modal, 'show-input');
+  $input.value = _defaultParams2['default'].inputValue;
+  $input.setAttribute('type', _defaultParams2['default'].inputType);
+  $input.setAttribute('placeholder', _defaultParams2['default'].inputPlaceholder);
+
+  resetInputError();
+};
+
+var resetInputError = function resetInputError(event) {
+  // If press enter => ignore
+  if (event && event.keyCode === 13) {
+    return false;
+  }
+
+  var $modal = getModal();
+
+  var $errorIcon = $modal.querySelector('.sa-input-error');
+  _removeClass$getTopMargin$fadeIn$show$addClass.removeClass($errorIcon, 'show');
+
+  var $errorContainer = $modal.querySelector('.sa-error-container');
+  _removeClass$getTopMargin$fadeIn$show$addClass.removeClass($errorContainer, 'show');
+};
+
+/*
+ * Set "margin-top"-property on modal based on its computed height
+ */
+var fixVerticalPosition = function fixVerticalPosition() {
+  var $modal = getModal();
+  $modal.style.marginTop = _removeClass$getTopMargin$fadeIn$show$addClass.getTopMargin(getModal());
+};
+
+exports.sweetAlertInitialize = sweetAlertInitialize;
+exports.getModal = getModal;
+exports.getOverlay = getOverlay;
+exports.getInput = getInput;
+exports.setFocusStyle = setFocusStyle;
+exports.openModal = openModal;
+exports.resetInput = resetInput;
+exports.resetInputError = resetInputError;
+exports.fixVerticalPosition = fixVerticalPosition;
+
+},{"./default-params":2,"./handle-dom":4,"./injected-html":7,"./utils":9}],7:[function(require,module,exports){
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var injectedHTML =
+
+// Dark overlay
+"<div class=\"sweet-overlay\" tabIndex=\"-1\"></div>" +
+
+// Modal
+"<div class=\"sweet-alert\">" +
+
+// Error icon
+"<div class=\"sa-icon sa-error\">\n      <span class=\"sa-x-mark\">\n        <span class=\"sa-line sa-left\"></span>\n        <span class=\"sa-line sa-right\"></span>\n      </span>\n    </div>" +
+
+// Warning icon
+"<div class=\"sa-icon sa-warning\">\n      <span class=\"sa-body\"></span>\n      <span class=\"sa-dot\"></span>\n    </div>" +
+
+// Info icon
+"<div class=\"sa-icon sa-info\"></div>" +
+
+// Success icon
+"<div class=\"sa-icon sa-success\">\n      <span class=\"sa-line sa-tip\"></span>\n      <span class=\"sa-line sa-long\"></span>\n\n      <div class=\"sa-placeholder\"></div>\n      <div class=\"sa-fix\"></div>\n    </div>" + "<div class=\"sa-icon sa-custom\"></div>" +
+
+// Title, text and input
+"<h2>Title</h2>\n    <p>Text</p>\n    <fieldset>\n      <input type=\"text\" tabIndex=\"3\" />\n      <div class=\"sa-input-error\"></div>\n    </fieldset>" +
+
+// Input errors
+"<div class=\"sa-error-container\">\n      <div class=\"icon\">!</div>\n      <p>Not valid!</p>\n    </div>" +
+
+// Cancel and confirm buttons
+"<div class=\"sa-button-container\">\n      <button class=\"cancel\" tabIndex=\"2\">Cancel</button>\n      <button class=\"confirm\" tabIndex=\"1\">OK</button>\n    </div>" +
+
+// End of modal
+"</div>";
+
+exports["default"] = injectedHTML;
+module.exports = exports["default"];
+
+},{}],8:[function(require,module,exports){
+'use strict';
+
+Object.defineProperty(exports, '__esModule', {
+  value: true
+});
+
+var _isIE8 = require('./utils');
+
+var _getModal$getInput$setFocusStyle = require('./handle-swal-dom');
+
+var _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide = require('./handle-dom');
+
+var alertTypes = ['error', 'warning', 'info', 'success', 'input', 'prompt'];
+
+/*
+ * Set type, text and actions on modal
+ */
+var setParameters = function setParameters(params) {
+  var modal = _getModal$getInput$setFocusStyle.getModal();
+
+  var $title = modal.querySelector('h2');
+  var $text = modal.querySelector('p');
+  var $cancelBtn = modal.querySelector('button.cancel');
+  var $confirmBtn = modal.querySelector('button.confirm');
+
+  /*
+   * Title
+   */
+  $title.innerHTML = params.html ? params.title : _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.escapeHtml(params.title).split('\n').join('<br>');
+
+  /*
+   * Text
+   */
+  $text.innerHTML = params.html ? params.text : _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.escapeHtml(params.text || '').split('\n').join('<br>');
+  if (params.text) _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.show($text);
+
+  /*
+   * Custom class
+   */
+  if (params.customClass) {
+    _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass(modal, params.customClass);
+    modal.setAttribute('data-custom-class', params.customClass);
+  } else {
+    // Find previously set classes and remove them
+    var customClass = modal.getAttribute('data-custom-class');
+    _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.removeClass(modal, customClass);
+    modal.setAttribute('data-custom-class', '');
+  }
+
+  /*
+   * Icon
+   */
+  _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.hide(modal.querySelectorAll('.sa-icon'));
+
+  if (params.type && !_isIE8.isIE8()) {
+    var _ret = (function () {
+
+      var validType = false;
+
+      for (var i = 0; i < alertTypes.length; i++) {
+        if (params.type === alertTypes[i]) {
+          validType = true;
+          break;
+        }
+      }
+
+      if (!validType) {
+        logStr('Unknown alert type: ' + params.type);
+        return {
+          v: false
+        };
+      }
+
+      var typesWithIcons = ['success', 'error', 'warning', 'info'];
+      var $icon = undefined;
+
+      if (typesWithIcons.indexOf(params.type) !== -1) {
+        $icon = modal.querySelector('.sa-icon.' + 'sa-' + params.type);
+        _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.show($icon);
+      }
+
+      var $input = _getModal$getInput$setFocusStyle.getInput();
+
+      // Animate icon
+      switch (params.type) {
+
+        case 'success':
+          _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass($icon, 'animate');
+          _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass($icon.querySelector('.sa-tip'), 'animateSuccessTip');
+          _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass($icon.querySelector('.sa-long'), 'animateSuccessLong');
+          break;
+
+        case 'error':
+          _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass($icon, 'animateErrorIcon');
+          _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass($icon.querySelector('.sa-x-mark'), 'animateXMark');
+          break;
+
+        case 'warning':
+          _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass($icon, 'pulseWarning');
+          _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass($icon.querySelector('.sa-body'), 'pulseWarningIns');
+          _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass($icon.querySelector('.sa-dot'), 'pulseWarningIns');
+          break;
+
+        case 'input':
+        case 'prompt':
+          $input.setAttribute('type', params.inputType);
+          $input.value = params.inputValue;
+          $input.setAttribute('placeholder', params.inputPlaceholder);
+          _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.addClass(modal, 'show-input');
+          setTimeout(function () {
+            $input.focus();
+            $input.addEventListener('keyup', swal.resetInputError);
+          }, 400);
+          break;
+      }
+    })();
+
+    if (typeof _ret === 'object') {
+      return _ret.v;
+    }
+  }
+
+  /*
+   * Custom image
+   */
+  if (params.imageUrl) {
+    var $customIcon = modal.querySelector('.sa-icon.sa-custom');
+
+    $customIcon.style.backgroundImage = 'url(' + params.imageUrl + ')';
+    _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.show($customIcon);
+
+    var _imgWidth = 80;
+    var _imgHeight = 80;
+
+    if (params.imageSize) {
+      var dimensions = params.imageSize.toString().split('x');
+      var imgWidth = dimensions[0];
+      var imgHeight = dimensions[1];
+
+      if (!imgWidth || !imgHeight) {
+        logStr('Parameter imageSize expects value with format WIDTHxHEIGHT, got ' + params.imageSize);
+      } else {
+        _imgWidth = imgWidth;
+        _imgHeight = imgHeight;
+      }
+    }
+
+    $customIcon.setAttribute('style', $customIcon.getAttribute('style') + 'width:' + _imgWidth + 'px; height:' + _imgHeight + 'px');
+  }
+
+  /*
+   * Show cancel button?
+   */
+  modal.setAttribute('data-has-cancel-button', params.showCancelButton);
+  if (params.showCancelButton) {
+    $cancelBtn.style.display = 'inline-block';
+  } else {
+    _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.hide($cancelBtn);
+  }
+
+  /*
+   * Show confirm button?
+   */
+  modal.setAttribute('data-has-confirm-button', params.showConfirmButton);
+  if (params.showConfirmButton) {
+    $confirmBtn.style.display = 'inline-block';
+  } else {
+    _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.hide($confirmBtn);
+  }
+
+  /*
+   * Custom text on cancel/confirm buttons
+   */
+  if (params.cancelButtonText) {
+    $cancelBtn.innerHTML = _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.escapeHtml(params.cancelButtonText);
+  }
+  if (params.confirmButtonText) {
+    $confirmBtn.innerHTML = _hasClass$addClass$removeClass$escapeHtml$_show$show$_hide$hide.escapeHtml(params.confirmButtonText);
+  }
+
+  /*
+   * Custom color on confirm button
+   */
+  if (params.confirmButtonColor) {
+    // Set confirm button to selected background color
+    $confirmBtn.style.backgroundColor = params.confirmButtonColor;
+
+    // Set box-shadow to default focused button
+    _getModal$getInput$setFocusStyle.setFocusStyle($confirmBtn, params.confirmButtonColor);
+  }
+
+  /*
+   * Allow outside click
+   */
+  modal.setAttribute('data-allow-outside-click', params.allowOutsideClick);
+
+  /*
+   * Callback function
+   */
+  var hasDoneFunction = params.doneFunction ? true : false;
+  modal.setAttribute('data-has-done-function', hasDoneFunction);
+
+  /*
+   * Animation
+   */
+  if (!params.animation) {
+    modal.setAttribute('data-animation', 'none');
+  } else if (typeof params.animation === 'string') {
+    modal.setAttribute('data-animation', params.animation); // Custom animation
+  } else {
+    modal.setAttribute('data-animation', 'pop');
+  }
+
+  /*
+   * Timer
+   */
+  modal.setAttribute('data-timer', params.timer);
+};
+
+exports['default'] = setParameters;
+module.exports = exports['default'];
+
+},{"./handle-dom":4,"./handle-swal-dom":6,"./utils":9}],9:[function(require,module,exports){
+'use strict';
+
+Object.defineProperty(exports, '__esModule', {
+  value: true
+});
+/*
+ * Allow user to pass their own params
+ */
+var extend = function extend(a, b) {
+  for (var key in b) {
+    if (b.hasOwnProperty(key)) {
+      a[key] = b[key];
+    }
+  }
+  return a;
+};
+
+/*
+ * Convert HEX codes to RGB values (#000000 -> rgb(0,0,0))
+ */
+var hexToRgb = function hexToRgb(hex) {
+  var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+  return result ? parseInt(result[1], 16) + ', ' + parseInt(result[2], 16) + ', ' + parseInt(result[3], 16) : null;
+};
+
+/*
+ * Check if the user is using Internet Explorer 8 (for fallbacks)
+ */
+var isIE8 = function isIE8() {
+  return window.attachEvent && !window.addEventListener;
+};
+
+/*
+ * IE compatible logging for developers
+ */
+var logStr = function logStr(string) {
+  if (window.console) {
+    // IE...
+    window.console.log('SweetAlert: ' + string);
+  }
+};
+
+/*
+ * Set hover, active and focus-states for buttons 
+ * (source: http://www.sitepoint.com/javascript-generate-lighter-darker-color)
+ */
+var colorLuminance = function colorLuminance(hex, lum) {
+  // Validate hex string
+  hex = String(hex).replace(/[^0-9a-f]/gi, '');
+  if (hex.length < 6) {
+    hex = hex[0] + hex[0] + hex[1] + hex[1] + hex[2] + hex[2];
+  }
+  lum = lum || 0;
+
+  // Convert to decimal and change luminosity
+  var rgb = '#';
+  var c;
+  var i;
+
+  for (i = 0; i < 3; i++) {
+    c = parseInt(hex.substr(i * 2, 2), 16);
+    c = Math.round(Math.min(Math.max(0, c + c * lum), 255)).toString(16);
+    rgb += ('00' + c).substr(c.length);
+  }
+
+  return rgb;
+};
+
+exports.extend = extend;
+exports.hexToRgb = hexToRgb;
+exports.isIE8 = isIE8;
+exports.logStr = logStr;
+exports.colorLuminance = colorLuminance;
+
+},{}]},{},[1])
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["node_modules/browserify/node_modules/browser-pack/_prelude.js","/Users/Tristan/dev/SweetAlert/dev/sweetalert.es6.js","/Users/Tristan/dev/SweetAlert/dev/modules/default-params.js","/Users/Tristan/dev/SweetAlert/dev/modules/handle-click.js","/Users/Tristan/dev/SweetAlert/dev/modules/handle-dom.js","/Users/Tristan/dev/SweetAlert/dev/modules/handle-key.js","/Users/Tristan/dev/SweetAlert/dev/modules/handle-swal-dom.js","/Users/Tristan/dev/SweetAlert/dev/modules/injected-html.js","/Users/Tristan/dev/SweetAlert/dev/modules/set-params.js","/Users/Tristan/dev/SweetAlert/dev/modules/utils.js"],"names":[],"mappings":"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","file":"generated.js","sourceRoot":"","sourcesContent":["(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})","// SweetAlert\n// 2014-2015 (c) - Tristan Edwards\n// github.com/t4t5/sweetalert\n\n/*\n * jQuery-like functions for manipulating the DOM\n */\nimport {\n  hasClass, addClass, removeClass, \n  escapeHtml, \n  _show, show, _hide, hide, \n  isDescendant, \n  getTopMargin,\n  fadeIn, fadeOut,\n  fireClick,\n  stopEventPropagation\n} from './modules/handle-dom';\n\n/*\n * Handy utilities\n */\nimport {\n  extend,\n  hexToRgb,\n  isIE8,\n  logStr,\n  colorLuminance\n} from './modules/utils';\n\n/*\n *  Handle sweetAlert's DOM elements\n */\nimport {\n  sweetAlertInitialize,\n  getModal,\n  getOverlay,\n  getInput,\n  setFocusStyle,\n  openModal,\n  resetInput,\n  fixVerticalPosition\n} from './modules/handle-swal-dom';\n\n\n// Handle button events and keyboard events\nimport { handleButton, handleConfirm, handleCancel } from './modules/handle-click';\nimport handleKeyDown from './modules/handle-key';\n\n\n// Default values\nimport defaultParams from './modules/default-params';\nimport setParameters from './modules/set-params';\n\n/*\n * Remember state in cases where opening and handling a modal will fiddle with it.\n * (We also use window.previousActiveElement as a global variable)\n */\nvar previousWindowKeyDown;\nvar lastFocusedButton;\n\n\n/*\n * Global sweetAlert function\n * (this is what the user calls)\n */\nvar sweetAlert, swal;\n\nsweetAlert = swal = function() {\n  var customizations = arguments[0];\n\n  addClass(document.body, 'stop-scrolling');\n  resetInput();\n\n  /*\n   * Use argument if defined or default value from params object otherwise.\n   * Supports the case where a default value is boolean true and should be\n   * overridden by a corresponding explicit argument which is boolean false.\n   */\n  function argumentOrDefault(key) {\n    var args = customizations;\n    return (args[key] === undefined) ?  defaultParams[key] : args[key];\n  }\n\n  if (customizations === undefined) {\n    logStr('SweetAlert expects at least 1 attribute!');\n    return false;\n  }\n\n  var params = extend({}, defaultParams);\n\n  switch (typeof customizations) {\n\n    // Ex: swal(\"Hello\", \"Just testing\", \"info\");\n    case 'string':\n      params.title = customizations;\n      params.text  = arguments[1] || '';\n      params.type  = arguments[2] || '';\n      break;\n\n    // Ex: swal({ title:\"Hello\", text: \"Just testing\", type: \"info\" });\n    case 'object':\n      if (customizations.title === undefined) {\n        logStr('Missing \"title\" argument!');\n        return false;\n      }\n\n      params.title = customizations.title;\n\n      for (let customName in defaultParams) {\n        params[customName] = argumentOrDefault(customName);\n      }\n\n      // Show \"Confirm\" instead of \"OK\" if cancel button is visible\n      params.confirmButtonText = params.showCancelButton ? 'Confirm' : defaultParams.confirmButtonText;\n      params.confirmButtonText = argumentOrDefault('confirmButtonText');\n\n      // Callback function when clicking on \"OK\"/\"Cancel\"\n      params.doneFunction = arguments[1] || null;\n\n      break;\n\n    default:\n      logStr('Unexpected type of argument! Expected \"string\" or \"object\", got ' + typeof customizations);\n      return false;\n\n  }\n\n  setParameters(params);\n  fixVerticalPosition();\n  openModal(arguments[1]);\n\n  // Modal interactions\n  var modal = getModal();\n\n\n  /* \n   * Make sure all modal buttons respond to all events\n   */\n  var $buttons = modal.querySelectorAll('button');\n  var buttonEvents = ['onclick', 'onmouseover', 'onmouseout', 'onmousedown', 'onmouseup', 'onfocus'];\n  var onButtonEvent = (e) => handleButton(e, params, modal);\n\n  for (let btnIndex = 0; btnIndex < $buttons.length; btnIndex++) {\n    for (let evtIndex = 0; evtIndex < buttonEvents.length; evtIndex++) {\n      let btnEvt = buttonEvents[evtIndex];\n      $buttons[btnIndex][btnEvt] = onButtonEvent;\n    }\n  }\n\n  // Clicking outside the modal dismisses it (if allowed by user)\n  getOverlay().onclick = onButtonEvent;\n\n  previousWindowKeyDown = window.onkeydown;\n\n  var onKeyEvent = (e) => handleKeyDown(e, params, modal);\n  window.onkeydown = onKeyEvent;\n\n  window.onfocus = function () {\n    // When the user has focused away and focused back from the whole window.\n    setTimeout(function () {\n      // Put in a timeout to jump out of the event sequence.\n      // Calling focus() in the event sequence confuses things.\n      if (lastFocusedButton !== undefined) {\n        lastFocusedButton.focus();\n        lastFocusedButton = undefined;\n      }\n    }, 0);\n  };\n};\n\n\n\n/*\n * Set default params for each popup\n * @param {Object} userParams\n */\nsweetAlert.setDefaults = swal.setDefaults = function(userParams) {\n  if (!userParams) {\n    throw new Error('userParams is required');\n  }\n  if (typeof userParams !== 'object') {\n    throw new Error('userParams has to be a object');\n  }\n\n  extend(defaultParams, userParams);\n};\n\n\n/*\n * Animation when closing modal\n */\nsweetAlert.close = swal.close = function() {\n  var modal = getModal();\n\n  fadeOut(getOverlay(), 5);\n  fadeOut(modal, 5);\n  removeClass(modal, 'showSweetAlert');\n  addClass(modal, 'hideSweetAlert');\n  removeClass(modal, 'visible');\n\n  /*\n   * Reset icon animations\n   */\n  var $successIcon = modal.querySelector('.sa-icon.sa-success');\n  removeClass($successIcon, 'animate');\n  removeClass($successIcon.querySelector('.sa-tip'), 'animateSuccessTip');\n  removeClass($successIcon.querySelector('.sa-long'), 'animateSuccessLong');\n\n  var $errorIcon = modal.querySelector('.sa-icon.sa-error');\n  removeClass($errorIcon, 'animateErrorIcon');\n  removeClass($errorIcon.querySelector('.sa-x-mark'), 'animateXMark');\n\n  var $warningIcon = modal.querySelector('.sa-icon.sa-warning');\n  removeClass($warningIcon, 'pulseWarning');\n  removeClass($warningIcon.querySelector('.sa-body'), 'pulseWarningIns');\n  removeClass($warningIcon.querySelector('.sa-dot'), 'pulseWarningIns');\n\n  // Reset custom class (delay so that UI changes aren't visible)\n  setTimeout(function() {\n    var customClass = modal.getAttribute('data-custom-class');\n    removeClass(modal, customClass);\n  }, 300);\n\n  // Make page scrollable again\n  removeClass(document.body, 'stop-scrolling');\n\n  // Reset the page to its previous state\n  window.onkeydown = previousWindowKeyDown;\n  if (window.previousActiveElement) {\n    window.previousActiveElement.focus();\n  }\n  lastFocusedButton = undefined;\n  clearTimeout(modal.timeout);\n\n  return true;\n};\n\n\n/*\n * Validation of the input field is done by user\n * If something is wrong => call showInputError with errorMessage\n */\nsweetAlert.showInputError = swal.showInputError = function(errorMessage) {\n  var modal = getModal();\n\n  var $errorIcon = modal.querySelector('.sa-input-error');\n  addClass($errorIcon, 'show');\n\n  var $errorContainer = modal.querySelector('.sa-error-container');\n  addClass($errorContainer, 'show');\n\n  $errorContainer.querySelector('p').innerHTML = errorMessage;\n\n  modal.querySelector('input').focus();\n};\n\n\n/*\n * Reset input error DOM elements\n */\nsweetAlert.resetInputError = swal.resetInputError = function(event) {\n  // If press enter => ignore\n  if (event && event.keyCode === 13) {\n    return false;\n  }\n\n  var $modal = getModal();\n\n  var $errorIcon = $modal.querySelector('.sa-input-error');\n  removeClass($errorIcon, 'show');\n\n  var $errorContainer = $modal.querySelector('.sa-error-container');\n  removeClass($errorContainer, 'show');\n};\n\nif (typeof window !== 'undefined') {\n  // The 'handle-click' module requires\n  // that 'sweetAlert' was set as global.\n  window.sweetAlert = window.swal = sweetAlert;\n} else {\n  logStr('SweetAlert is a frontend module!');\n}\n","var defaultParams = {\n  title: '',\n  text: '',\n  type: null,\n  allowOutsideClick: false,\n  showConfirmButton: true,\n  showCancelButton: false,\n  closeOnConfirm: true,\n  closeOnCancel: true,\n  confirmButtonText: 'OK',\n  confirmButtonColor: '#AEDEF4',\n  cancelButtonText: 'Cancel',\n  imageUrl: null,\n  imageSize: null,\n  timer: null,\n  customClass: '',\n  html: false,\n  animation: true,\n  allowEscapeKey: true,\n  inputType: 'text',\n  inputPlaceholder: '',\n  inputValue: ''\n};\n\nexport default defaultParams;","import { colorLuminance } from './utils';\nimport { getModal } from './handle-swal-dom';\nimport { hasClass, isDescendant } from './handle-dom';\n\n\n/*\n * User clicked on \"Confirm\"/\"OK\" or \"Cancel\"\n */\nvar handleButton = function(event, params, modal) {\n  var e = event || window.event;\n  var target = e.target || e.srcElement;\n\n  var targetedConfirm = target.className.indexOf('confirm') !== -1;\n  var targetedOverlay = target.className.indexOf('sweet-overlay') !== -1;\n  var modalIsVisible  = hasClass(modal, 'visible');\n  var doneFunctionExists = (params.doneFunction && modal.getAttribute('data-has-done-function') === 'true');\n\n  // Since the user can change the background-color of the confirm button programmatically,\n  // we must calculate what the color should be on hover/active\n  var normalColor, hoverColor, activeColor;\n  if (targetedConfirm && params.confirmButtonColor) {\n    normalColor  = params.confirmButtonColor;\n    hoverColor   = colorLuminance(normalColor, -0.04);\n    activeColor  = colorLuminance(normalColor, -0.14);\n  }\n\n  function shouldSetConfirmButtonColor(color) {\n    if (targetedConfirm && params.confirmButtonColor) {\n      target.style.backgroundColor = color;\n    }\n  }\n\n  switch (e.type) {\n    case 'mouseover':\n      shouldSetConfirmButtonColor(hoverColor);\n      break;\n\n    case 'mouseout':\n      shouldSetConfirmButtonColor(normalColor);\n      break;\n\n    case 'mousedown':\n      shouldSetConfirmButtonColor(activeColor);\n      break;\n\n    case 'mouseup':\n      shouldSetConfirmButtonColor(hoverColor);\n      break;\n\n    case 'focus':\n      let $confirmButton = modal.querySelector('button.confirm');\n      let $cancelButton  = modal.querySelector('button.cancel');\n\n      if (targetedConfirm) {\n        $cancelButton.style.boxShadow = 'none';\n      } else {\n        $confirmButton.style.boxShadow = 'none';\n      }\n      break;\n\n    case 'click':\n      let clickedOnModal = (modal === target);\n      let clickedOnModalChild = isDescendant(modal, target);\n\n      // Ignore click outside if allowOutsideClick is false\n      if (!clickedOnModal && !clickedOnModalChild && modalIsVisible && !params.allowOutsideClick) {\n        break;\n      }\n\n      if (targetedConfirm && doneFunctionExists && modalIsVisible) {\n        handleConfirm(modal, params);\n      } else if (doneFunctionExists && modalIsVisible || targetedOverlay) {\n        handleCancel(modal, params);\n      } else if (isDescendant(modal, target) && target.tagName === 'BUTTON') {\n        sweetAlert.close();\n      }\n      break;\n  }\n};\n\n/*\n *  User clicked on \"Confirm\"/\"OK\"\n */\nvar handleConfirm = function(modal, params) {\n  var callbackValue = true;\n\n  if (hasClass(modal, 'show-input')) {\n    callbackValue = modal.querySelector('input').value;\n\n    if (!callbackValue) {\n      callbackValue = '';\n    }\n  }\n\n  params.doneFunction(callbackValue);\n\n  if (params.closeOnConfirm) {\n    sweetAlert.close();\n  }\n};\n\n/*\n *  User clicked on \"Cancel\"\n */\nvar handleCancel = function(modal, params) {\n  // Check if callback function expects a parameter (to track cancel actions)\n  var functionAsStr = String(params.doneFunction).replace(/\\s/g, '');\n  var functionHandlesCancel = functionAsStr.substring(0, 9) === 'function(' && functionAsStr.substring(9, 10) !== ')';\n\n  if (functionHandlesCancel) {\n    params.doneFunction(false);\n  }\n\n  if (params.closeOnCancel) {\n    sweetAlert.close();\n  }\n};\n\n\nexport default {\n  handleButton,\n  handleConfirm,\n  handleCancel\n};","var hasClass = function(elem, className) {\n  return new RegExp(' ' + className + ' ').test(' ' + elem.className + ' ');\n};\n\nvar addClass = function(elem, className) {\n  if (!hasClass(elem, className)) {\n    elem.className += ' ' + className;\n  }\n};\n\nvar removeClass = function(elem, className) {\n  var newClass = ' ' + elem.className.replace(/[\\t\\r\\n]/g, ' ') + ' ';\n  if (hasClass(elem, className)) {\n    while (newClass.indexOf(' ' + className + ' ') >= 0) {\n      newClass = newClass.replace(' ' + className + ' ', ' ');\n    }\n    elem.className = newClass.replace(/^\\s+|\\s+$/g, '');\n  }\n};\n\nvar escapeHtml = function(str) {\n  var div = document.createElement('div');\n  div.appendChild(document.createTextNode(str));\n  return div.innerHTML;\n};\n\nvar _show = function(elem) {\n  elem.style.opacity = '';\n  elem.style.display = 'block';\n};\n\nvar show = function(elems) {\n  if (elems && !elems.length) {\n    return _show(elems);\n  }\n  for (var i = 0; i < elems.length; ++i) {\n    _show(elems[i]);\n  }\n};\n\nvar _hide = function(elem) {\n  elem.style.opacity = '';\n  elem.style.display = 'none';\n};\n\nvar hide = function(elems) {\n  if (elems && !elems.length) {\n    return _hide(elems);\n  }\n  for (var i = 0; i < elems.length; ++i) {\n    _hide(elems[i]);\n  }\n};\n\nvar isDescendant = function(parent, child) {\n  var node = child.parentNode;\n  while (node !== null) {\n    if (node === parent) {\n      return true;\n    }\n    node = node.parentNode;\n  }\n  return false;\n};\n\nvar getTopMargin = function(elem) {\n  elem.style.left = '-9999px';\n  elem.style.display = 'block';\n\n  var height = elem.clientHeight,\n      padding;\n  if (typeof getComputedStyle !== \"undefined\") { // IE 8\n    padding = parseInt(getComputedStyle(elem).getPropertyValue('padding-top'), 10);\n  } else {\n    padding = parseInt(elem.currentStyle.padding);\n  }\n\n  elem.style.left = '';\n  elem.style.display = 'none';\n  return ('-' + parseInt((height + padding) / 2) + 'px');\n};\n\nvar fadeIn = function(elem, interval) {\n  if (+elem.style.opacity < 1) {\n    interval = interval || 16;\n    elem.style.opacity = 0;\n    elem.style.display = 'block';\n    var last = +new Date();\n    var tick = function() {\n      elem.style.opacity = +elem.style.opacity + (new Date() - last) / 100;\n      last = +new Date();\n\n      if (+elem.style.opacity < 1) {\n        setTimeout(tick, interval);\n      }\n    };\n    tick();\n  }\n  elem.style.display = 'block'; //fallback IE8\n};\n\nvar fadeOut = function(elem, interval) {\n  interval = interval || 16;\n  elem.style.opacity = 1;\n  var last = +new Date();\n  var tick = function() {\n    elem.style.opacity = +elem.style.opacity - (new Date() - last) / 100;\n    last = +new Date();\n\n    if (+elem.style.opacity > 0) {\n      setTimeout(tick, interval);\n    } else {\n      elem.style.display = 'none';\n    }\n  };\n  tick();\n};\n\nvar fireClick = function(node) {\n  // Taken from http://www.nonobtrusive.com/2011/11/29/programatically-fire-crossbrowser-click-event-with-javascript/\n  // Then fixed for today's Chrome browser.\n  if (typeof MouseEvent === 'function') {\n    // Up-to-date approach\n    var mevt = new MouseEvent('click', {\n      view: window,\n      bubbles: false,\n      cancelable: true\n    });\n    node.dispatchEvent(mevt);\n  } else if ( document.createEvent ) {\n    // Fallback\n    var evt = document.createEvent('MouseEvents');\n    evt.initEvent('click', false, false);\n    node.dispatchEvent(evt);\n  } else if (document.createEventObject) {\n    node.fireEvent('onclick') ;\n  } else if (typeof node.onclick === 'function' ) {\n    node.onclick();\n  }\n};\n\nvar stopEventPropagation = function(e) {\n  // In particular, make sure the space bar doesn't scroll the main window.\n  if (typeof e.stopPropagation === 'function') {\n    e.stopPropagation();\n    e.preventDefault();\n  } else if (window.event && window.event.hasOwnProperty('cancelBubble')) {\n    window.event.cancelBubble = true;\n  }\n};\n\nexport { \n  hasClass, addClass, removeClass, \n  escapeHtml, \n  _show, show, _hide, hide, \n  isDescendant, \n  getTopMargin,\n  fadeIn, fadeOut,\n  fireClick,\n  stopEventPropagation\n};\n","import { stopEventPropagation, fireClick } from './handle-dom';\nimport { setFocusStyle } from './handle-swal-dom';\n\n\nvar handleKeyDown = function(event, params, modal) {\n  var e = event || window.event;\n  var keyCode = e.keyCode || e.which;\n\n  var $okButton     = modal.querySelector('button.confirm');\n  var $cancelButton = modal.querySelector('button.cancel');\n  var $modalButtons = modal.querySelectorAll('button[tabindex]');\n\n\n  if ([9, 13, 32, 27].indexOf(keyCode) === -1) {\n    // Don't do work on keys we don't care about.\n    return;\n  }\n\n  var $targetElement = e.target || e.srcElement;\n\n  var btnIndex = -1; // Find the button - note, this is a nodelist, not an array.\n  for (var i = 0; i < $modalButtons.length; i++) {\n    if ($targetElement === $modalButtons[i]) {\n      btnIndex = i;\n      break;\n    }\n  }\n\n  if (keyCode === 9) {\n    // TAB\n    if (btnIndex === -1) {\n      // No button focused. Jump to the confirm button.\n      $targetElement = $okButton;\n    } else {\n      // Cycle to the next button\n      if (btnIndex === $modalButtons.length - 1) {\n        $targetElement = $modalButtons[0];\n      } else {\n        $targetElement = $modalButtons[btnIndex + 1];\n      }\n    }\n\n    stopEventPropagation(e);\n    $targetElement.focus();\n\n    if (params.confirmButtonColor) {\n      setFocusStyle($targetElement, params.confirmButtonColor);\n    }\n  } else {\n    if (keyCode === 13) {\n      if ($targetElement.tagName === 'INPUT') {\n        $targetElement = $okButton;\n        $okButton.focus();\n      }\n\n      if (btnIndex === -1) {\n        // ENTER/SPACE clicked outside of a button.\n        $targetElement = $okButton;\n      } else {\n        // Do nothing - let the browser handle it.\n        $targetElement = undefined;\n      }\n    } else if (keyCode === 27 && params.allowEscapeKey === true) {\n      $targetElement = $cancelButton;\n      fireClick($targetElement, e);\n    } else {\n      // Fallback - let the browser handle it.\n      $targetElement = undefined;\n    }\n  }\n};\n\nexport default handleKeyDown;\n","import { hexToRgb } from './utils';\nimport { removeClass, getTopMargin, fadeIn, show, addClass } from './handle-dom';\nimport defaultParams from './default-params';\n\nvar modalClass   = '.sweet-alert';\nvar overlayClass = '.sweet-overlay';\n\n/*\n * Add modal + overlay to DOM\n */\nimport injectedHTML from './injected-html';\n\nvar sweetAlertInitialize = function() {\n  var sweetWrap = document.createElement('div');\n  sweetWrap.innerHTML = injectedHTML;\n\n  // Append elements to body\n  while (sweetWrap.firstChild) {\n    document.body.appendChild(sweetWrap.firstChild);\n  }\n};\n\n/*\n * Get DOM element of modal\n */\nvar getModal = function() {\n  var $modal = document.querySelector(modalClass);\n\n  if (!$modal) {\n    sweetAlertInitialize();\n    $modal = getModal();\n  }\n\n  return $modal;\n};\n\n/*\n * Get DOM element of input (in modal)\n */\nvar getInput = function() {\n  var $modal = getModal();\n  if ($modal) {\n    return $modal.querySelector('input');\n  }\n};\n\n/*\n * Get DOM element of overlay\n */\nvar getOverlay = function() {\n  return document.querySelector(overlayClass);\n};\n\n/*\n * Add box-shadow style to button (depending on its chosen bg-color)\n */\nvar setFocusStyle = function($button, bgColor) {\n  var rgbColor = hexToRgb(bgColor);\n  $button.style.boxShadow = '0 0 2px rgba(' + rgbColor + ', 0.8), inset 0 0 0 1px rgba(0, 0, 0, 0.05)';\n};\n\n/*\n * Animation when opening modal\n */\nvar openModal = function(callback) {\n  var $modal = getModal();\n  fadeIn(getOverlay(), 10);\n  show($modal);\n  addClass($modal, 'showSweetAlert');\n  removeClass($modal, 'hideSweetAlert');\n\n  window.previousActiveElement = document.activeElement;\n  var $okButton = $modal.querySelector('button.confirm');\n  $okButton.focus();\n\n  setTimeout(function () {\n    addClass($modal, 'visible');\n  }, 500);\n\n  var timer = $modal.getAttribute('data-timer');\n\n  if (timer !== 'null' && timer !== '') {\n    var timerCallback = callback;\n    $modal.timeout = setTimeout(function() {\n      var doneFunctionExists = ((timerCallback || null) && $modal.getAttribute('data-has-done-function') === 'true');\n      if (doneFunctionExists) { \n        timerCallback(null);\n      }\n      else {\n        sweetAlert.close();\n      }\n    }, timer);\n  }\n};\n\n/*\n * Reset the styling of the input\n * (for example if errors have been shown)\n */\nvar resetInput = function() {\n  var $modal = getModal();\n  var $input = getInput();\n\n  removeClass($modal, 'show-input');\n  $input.value = defaultParams.inputValue;\n  $input.setAttribute('type', defaultParams.inputType);\n  $input.setAttribute('placeholder', defaultParams.inputPlaceholder);\n\n  resetInputError();\n};\n\n\nvar resetInputError = function(event) {\n  // If press enter => ignore\n  if (event && event.keyCode === 13) {\n    return false;\n  }\n\n  var $modal = getModal();\n\n  var $errorIcon = $modal.querySelector('.sa-input-error');\n  removeClass($errorIcon, 'show');\n\n  var $errorContainer = $modal.querySelector('.sa-error-container');\n  removeClass($errorContainer, 'show');\n};\n\n\n/*\n * Set \"margin-top\"-property on modal based on its computed height\n */\nvar fixVerticalPosition = function() {\n  var $modal = getModal();\n  $modal.style.marginTop = getTopMargin(getModal());\n};\n\n\nexport { \n  sweetAlertInitialize,\n  getModal,\n  getOverlay,\n  getInput,\n  setFocusStyle,\n  openModal,\n  resetInput,\n  resetInputError,\n  fixVerticalPosition\n};\n","var injectedHTML = \n\n  // Dark overlay\n  `<div class=\"sweet-overlay\" tabIndex=\"-1\"></div>` +\n\n  // Modal\n  `<div class=\"sweet-alert\">` +\n\n    // Error icon\n    `<div class=\"sa-icon sa-error\">\n      <span class=\"sa-x-mark\">\n        <span class=\"sa-line sa-left\"></span>\n        <span class=\"sa-line sa-right\"></span>\n      </span>\n    </div>` +\n\n    // Warning icon\n    `<div class=\"sa-icon sa-warning\">\n      <span class=\"sa-body\"></span>\n      <span class=\"sa-dot\"></span>\n    </div>` +\n\n    // Info icon\n    `<div class=\"sa-icon sa-info\"></div>` +\n\n    // Success icon\n    `<div class=\"sa-icon sa-success\">\n      <span class=\"sa-line sa-tip\"></span>\n      <span class=\"sa-line sa-long\"></span>\n\n      <div class=\"sa-placeholder\"></div>\n      <div class=\"sa-fix\"></div>\n    </div>` +\n\n    `<div class=\"sa-icon sa-custom\"></div>` +\n\n    // Title, text and input\n    `<h2>Title</h2>\n    <p>Text</p>\n    <fieldset>\n      <input type=\"text\" tabIndex=\"3\" />\n      <div class=\"sa-input-error\"></div>\n    </fieldset>` +\n\n    // Input errors\n    `<div class=\"sa-error-container\">\n      <div class=\"icon\">!</div>\n      <p>Not valid!</p>\n    </div>` +\n\n    // Cancel and confirm buttons\n    `<div class=\"sa-button-container\">\n      <button class=\"cancel\" tabIndex=\"2\">Cancel</button>\n      <button class=\"confirm\" tabIndex=\"1\">OK</button>\n    </div>` +\n\n  // End of modal\n  `</div>`;\n\nexport default injectedHTML;","var alertTypes = ['error', 'warning', 'info', 'success', 'input', 'prompt'];\n\nimport {\n  isIE8\n} from './utils';\n\nimport {\n  getModal,\n  getInput,\n  setFocusStyle\n} from './handle-swal-dom';\n\nimport {\n  hasClass, addClass, removeClass, \n  escapeHtml, \n  _show, show, _hide, hide\n} from './handle-dom';\n\n\n/*\n * Set type, text and actions on modal\n */\nvar setParameters = function(params) {\n  var modal = getModal();\n\n  var $title = modal.querySelector('h2');\n  var $text = modal.querySelector('p');\n  var $cancelBtn = modal.querySelector('button.cancel');\n  var $confirmBtn = modal.querySelector('button.confirm');\n\n  /*\n   * Title\n   */\n  $title.innerHTML = params.html ? params.title : escapeHtml(params.title).split('\\n').join('<br>');\n\n  /*\n   * Text\n   */\n  $text.innerHTML = params.html ? params.text : escapeHtml(params.text || '').split('\\n').join('<br>');\n  if (params.text) show($text);\n\n  /*\n   * Custom class\n   */\n  if (params.customClass) {\n    addClass(modal, params.customClass);\n    modal.setAttribute('data-custom-class', params.customClass);\n  } else {\n    // Find previously set classes and remove them\n    let customClass = modal.getAttribute('data-custom-class');\n    removeClass(modal, customClass);\n    modal.setAttribute('data-custom-class', '');\n  }\n\n  /*\n   * Icon\n   */\n  hide(modal.querySelectorAll('.sa-icon'));\n\n  if (params.type && !isIE8()) {\n\n    let validType = false;\n\n    for (let i = 0; i < alertTypes.length; i++) {\n      if (params.type === alertTypes[i]) {\n        validType = true;\n        break;\n      }\n    }\n\n    if (!validType) {\n      logStr('Unknown alert type: ' + params.type);\n      return false;\n    }\n\n    let typesWithIcons = ['success', 'error', 'warning', 'info'];\n    let $icon;\n\n    if (typesWithIcons.indexOf(params.type) !== -1) {\n      $icon = modal.querySelector('.sa-icon.' + 'sa-' + params.type);\n      show($icon);\n    }\n\n    let $input = getInput();\n\n    // Animate icon\n    switch (params.type) {\n\n      case 'success':\n        addClass($icon, 'animate');\n        addClass($icon.querySelector('.sa-tip'), 'animateSuccessTip');\n        addClass($icon.querySelector('.sa-long'), 'animateSuccessLong');\n        break;\n\n      case 'error':\n        addClass($icon, 'animateErrorIcon');\n        addClass($icon.querySelector('.sa-x-mark'), 'animateXMark');\n        break;\n\n      case 'warning':\n        addClass($icon, 'pulseWarning');\n        addClass($icon.querySelector('.sa-body'), 'pulseWarningIns');\n        addClass($icon.querySelector('.sa-dot'), 'pulseWarningIns');\n        break;\n\n      case 'input':\n      case 'prompt':\n        $input.setAttribute('type', params.inputType);\n        $input.value = params.inputValue;\n        $input.setAttribute('placeholder', params.inputPlaceholder);\n        addClass(modal, 'show-input');\n        setTimeout(function () {\n          $input.focus();\n          $input.addEventListener('keyup', swal.resetInputError);\n        }, 400);\n        break;\n    }\n  }\n\n  /*\n   * Custom image\n   */\n  if (params.imageUrl) {\n    let $customIcon = modal.querySelector('.sa-icon.sa-custom');\n\n    $customIcon.style.backgroundImage = 'url(' + params.imageUrl + ')';\n    show($customIcon);\n\n    let _imgWidth = 80;\n    let _imgHeight = 80;\n\n    if (params.imageSize) {\n      let dimensions = params.imageSize.toString().split('x');\n      let imgWidth = dimensions[0];\n      let imgHeight = dimensions[1];\n\n      if (!imgWidth || !imgHeight) {\n        logStr('Parameter imageSize expects value with format WIDTHxHEIGHT, got ' + params.imageSize);\n      } else {\n        _imgWidth = imgWidth;\n        _imgHeight = imgHeight;\n      }\n    }\n\n    $customIcon.setAttribute('style', $customIcon.getAttribute('style') + 'width:' + _imgWidth + 'px; height:' + _imgHeight + 'px');\n  }\n\n  /*\n   * Show cancel button?\n   */\n  modal.setAttribute('data-has-cancel-button', params.showCancelButton);\n  if (params.showCancelButton) {\n    $cancelBtn.style.display = 'inline-block';\n  } else {\n    hide($cancelBtn);\n  }\n\n  /*\n   * Show confirm button?\n   */\n  modal.setAttribute('data-has-confirm-button', params.showConfirmButton);\n  if (params.showConfirmButton) {\n    $confirmBtn.style.display = 'inline-block';\n  } else {\n    hide($confirmBtn);\n  }\n\n  /*\n   * Custom text on cancel/confirm buttons\n   */\n  if (params.cancelButtonText) {\n    $cancelBtn.innerHTML = escapeHtml(params.cancelButtonText);\n  }\n  if (params.confirmButtonText) {\n    $confirmBtn.innerHTML = escapeHtml(params.confirmButtonText);\n  }\n\n  /*\n   * Custom color on confirm button\n   */\n  if (params.confirmButtonColor) {\n    // Set confirm button to selected background color\n    $confirmBtn.style.backgroundColor = params.confirmButtonColor;\n\n    // Set box-shadow to default focused button\n    setFocusStyle($confirmBtn, params.confirmButtonColor);\n  }\n\n  /*\n   * Allow outside click\n   */\n  modal.setAttribute('data-allow-outside-click', params.allowOutsideClick);\n\n  /*\n   * Callback function\n   */\n  var hasDoneFunction = params.doneFunction ? true : false;\n  modal.setAttribute('data-has-done-function', hasDoneFunction);\n\n  /*\n   * Animation\n   */\n  if (!params.animation) {\n    modal.setAttribute('data-animation', 'none');\n  } else if (typeof params.animation === 'string') {\n    modal.setAttribute('data-animation', params.animation); // Custom animation\n  } else {\n    modal.setAttribute('data-animation', 'pop');\n  }\n\n  /*\n   * Timer\n   */\n  modal.setAttribute('data-timer', params.timer);\n};\n\nexport default setParameters;\n","/*\n * Allow user to pass their own params\n */\nvar extend = function(a, b) {\n  for (var key in b) {\n    if (b.hasOwnProperty(key)) {\n      a[key] = b[key];\n    }\n  }\n  return a;\n};\n\n/*\n * Convert HEX codes to RGB values (#000000 -> rgb(0,0,0))\n */\nvar hexToRgb = function(hex) {\n  var result = /^#?([a-f\\d]{2})([a-f\\d]{2})([a-f\\d]{2})$/i.exec(hex);\n  return result ? parseInt(result[1], 16) + ', ' + parseInt(result[2], 16) + ', ' + parseInt(result[3], 16) : null;\n};\n\n/*\n * Check if the user is using Internet Explorer 8 (for fallbacks)\n */\nvar isIE8 = function() {\n  return (window.attachEvent && !window.addEventListener);\n};\n\n/*\n * IE compatible logging for developers\n */\nvar logStr = function(string) {\n  if (window.console) {\n    // IE...\n    window.console.log('SweetAlert: ' + string);\n  }\n};\n\n/*\n * Set hover, active and focus-states for buttons \n * (source: http://www.sitepoint.com/javascript-generate-lighter-darker-color)\n */\nvar colorLuminance = function(hex, lum) {\n  // Validate hex string\n  hex = String(hex).replace(/[^0-9a-f]/gi, '');\n  if (hex.length < 6) {\n    hex = hex[0] + hex[0] + hex[1] + hex[1] + hex[2] + hex[2];\n  }\n  lum = lum || 0;\n\n  // Convert to decimal and change luminosity\n  var rgb = '#';\n  var c;\n  var i;\n\n  for (i = 0; i < 3; i++) {\n    c = parseInt(hex.substr(i * 2, 2), 16);\n    c = Math.round(Math.min(Math.max(0, c + c * lum), 255)).toString(16);\n    rgb += ('00' + c).substr(c.length);\n  }\n\n  return rgb;\n};\n\n\nexport {\n  extend,\n  hexToRgb,\n  isIE8,\n  logStr,\n  colorLuminance\n};\n"]}
+
+  
+  /*
+   * Use SweetAlert with RequireJS
+   */
+  
+  if (typeof define === 'function' && define.amd) {
+    define(function () {
+      return sweetAlert;
+    });
+  } else if (typeof module !== 'undefined' && module.exports) {
+    module.exports = sweetAlert;
+  }
+
+})(window, document);
\ No newline at end of file
diff --git a/src/main/webapp/bower_components/sweetalert/sweetalert.css b/src/main/webapp/bower_components/sweetalert/sweetalert.css
new file mode 100644
index 0000000..4469aea
--- /dev/null
+++ b/src/main/webapp/bower_components/sweetalert/sweetalert.css
@@ -0,0 +1,715 @@
+body.stop-scrolling {
+  height: 100%;
+  overflow: hidden; }
+
+.sweet-overlay {
+  background-color: black;
+  /* IE8 */
+  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=40)";
+  /* IE8 */
+  background-color: rgba(0, 0, 0, 0.4);
+  position: fixed;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  display: none;
+  z-index: 10000; }
+
+.sweet-alert {
+  background-color: white;
+  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  width: 478px;
+  padding: 17px;
+  border-radius: 5px;
+  text-align: center;
+  position: fixed;
+  left: 50%;
+  top: 50%;
+  margin-left: -256px;
+  margin-top: -200px;
+  overflow: hidden;
+  display: none;
+  z-index: 99999; }
+  @media all and (max-width: 540px) {
+    .sweet-alert {
+      width: auto;
+      margin-left: 0;
+      margin-right: 0;
+      left: 15px;
+      right: 15px; } }
+  .sweet-alert h2 {
+    color: #575757;
+    font-size: 30px;
+    text-align: center;
+    font-weight: 600;
+    text-transform: none;
+    position: relative;
+    margin: 25px 0;
+    padding: 0;
+    line-height: 40px;
+    display: block; }
+  .sweet-alert p {
+    color: #797979;
+    font-size: 16px;
+    text-align: center;
+    font-weight: 300;
+    position: relative;
+    text-align: inherit;
+    float: none;
+    margin: 0;
+    padding: 0;
+    line-height: normal; }
+  .sweet-alert fieldset {
+    border: none;
+    position: relative; }
+  .sweet-alert .sa-error-container {
+    background-color: #f1f1f1;
+    margin-left: -17px;
+    margin-right: -17px;
+    overflow: hidden;
+    padding: 0 10px;
+    max-height: 0;
+    webkit-transition: padding 0.15s, max-height 0.15s;
+    transition: padding 0.15s, max-height 0.15s; }
+    .sweet-alert .sa-error-container.show {
+      padding: 10px 0;
+      max-height: 100px;
+      webkit-transition: padding 0.2s, max-height 0.2s;
+      transition: padding 0.25s, max-height 0.25s; }
+    .sweet-alert .sa-error-container .icon {
+      display: inline-block;
+      width: 24px;
+      height: 24px;
+      border-radius: 50%;
+      background-color: #ea7d7d;
+      color: white;
+      line-height: 24px;
+      text-align: center;
+      margin-right: 3px; }
+    .sweet-alert .sa-error-container p {
+      display: inline-block; }
+  .sweet-alert .sa-input-error {
+    position: absolute;
+    top: 29px;
+    right: 26px;
+    width: 20px;
+    height: 20px;
+    opacity: 0;
+    -webkit-transform: scale(0.5);
+    transform: scale(0.5);
+    -webkit-transform-origin: 50% 50%;
+    transform-origin: 50% 50%;
+    -webkit-transition: all 0.1s;
+    transition: all 0.1s; }
+    .sweet-alert .sa-input-error::before, .sweet-alert .sa-input-error::after {
+      content: "";
+      width: 20px;
+      height: 6px;
+      background-color: #f06e57;
+      border-radius: 3px;
+      position: absolute;
+      top: 50%;
+      margin-top: -4px;
+      left: 50%;
+      margin-left: -9px; }
+    .sweet-alert .sa-input-error::before {
+      -webkit-transform: rotate(-45deg);
+      transform: rotate(-45deg); }
+    .sweet-alert .sa-input-error::after {
+      -webkit-transform: rotate(45deg);
+      transform: rotate(45deg); }
+    .sweet-alert .sa-input-error.show {
+      opacity: 1;
+      -webkit-transform: scale(1);
+      transform: scale(1); }
+  .sweet-alert input {
+    width: 100%;
+    box-sizing: border-box;
+    border-radius: 3px;
+    border: 1px solid #d7d7d7;
+    height: 43px;
+    margin-top: 10px;
+    margin-bottom: 17px;
+    font-size: 18px;
+    box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.06);
+    padding: 0 12px;
+    display: none;
+    -webkit-transition: all 0.3s;
+    transition: all 0.3s; }
+    .sweet-alert input:focus {
+      outline: none;
+      box-shadow: 0px 0px 3px #c4e6f5;
+      border: 1px solid #b4dbed; }
+      .sweet-alert input:focus::-moz-placeholder {
+        transition: opacity 0.3s 0.03s ease;
+        opacity: 0.5; }
+      .sweet-alert input:focus:-ms-input-placeholder {
+        transition: opacity 0.3s 0.03s ease;
+        opacity: 0.5; }
+      .sweet-alert input:focus::-webkit-input-placeholder {
+        transition: opacity 0.3s 0.03s ease;
+        opacity: 0.5; }
+    .sweet-alert input::-moz-placeholder {
+      color: #bdbdbd; }
+    .sweet-alert input:-ms-input-placeholder {
+      color: #bdbdbd; }
+    .sweet-alert input::-webkit-input-placeholder {
+      color: #bdbdbd; }
+  .sweet-alert.show-input input {
+    display: block; }
+  .sweet-alert button {
+    background-color: #AEDEF4;
+    color: white;
+    border: none;
+    box-shadow: none;
+    font-size: 17px;
+    font-weight: 500;
+    -webkit-border-radius: 4px;
+    border-radius: 5px;
+    padding: 10px 32px;
+    margin: 26px 5px 0 5px;
+    cursor: pointer; }
+    .sweet-alert button:focus {
+      outline: none;
+      box-shadow: 0 0 2px rgba(128, 179, 235, 0.5), inset 0 0 0 1px rgba(0, 0, 0, 0.05); }
+    .sweet-alert button:hover {
+      background-color: #a1d9f2; }
+    .sweet-alert button:active {
+      background-color: #81ccee; }
+    .sweet-alert button.cancel {
+      background-color: #D0D0D0; }
+      .sweet-alert button.cancel:hover {
+        background-color: #c8c8c8; }
+      .sweet-alert button.cancel:active {
+        background-color: #b6b6b6; }
+      .sweet-alert button.cancel:focus {
+        box-shadow: rgba(197, 205, 211, 0.8) 0px 0px 2px, rgba(0, 0, 0, 0.0470588) 0px 0px 0px 1px inset !important; }
+    .sweet-alert button::-moz-focus-inner {
+      border: 0; }
+  .sweet-alert[data-has-cancel-button=false] button {
+    box-shadow: none !important; }
+  .sweet-alert[data-has-confirm-button=false][data-has-cancel-button=false] {
+    padding-bottom: 40px; }
+  .sweet-alert .sa-icon {
+    width: 80px;
+    height: 80px;
+    border: 4px solid gray;
+    -webkit-border-radius: 40px;
+    border-radius: 40px;
+    border-radius: 50%;
+    margin: 20px auto;
+    padding: 0;
+    position: relative;
+    box-sizing: content-box; }
+    .sweet-alert .sa-icon.sa-error {
+      border-color: #F27474; }
+      .sweet-alert .sa-icon.sa-error .sa-x-mark {
+        position: relative;
+        display: block; }
+      .sweet-alert .sa-icon.sa-error .sa-line {
+        position: absolute;
+        height: 5px;
+        width: 47px;
+        background-color: #F27474;
+        display: block;
+        top: 37px;
+        border-radius: 2px; }
+        .sweet-alert .sa-icon.sa-error .sa-line.sa-left {
+          -webkit-transform: rotate(45deg);
+          transform: rotate(45deg);
+          left: 17px; }
+        .sweet-alert .sa-icon.sa-error .sa-line.sa-right {
+          -webkit-transform: rotate(-45deg);
+          transform: rotate(-45deg);
+          right: 16px; }
+    .sweet-alert .sa-icon.sa-warning {
+      border-color: #F8BB86; }
+      .sweet-alert .sa-icon.sa-warning .sa-body {
+        position: absolute;
+        width: 5px;
+        height: 47px;
+        left: 50%;
+        top: 10px;
+        -webkit-border-radius: 2px;
+        border-radius: 2px;
+        margin-left: -2px;
+        background-color: #F8BB86; }
+      .sweet-alert .sa-icon.sa-warning .sa-dot {
+        position: absolute;
+        width: 7px;
+        height: 7px;
+        -webkit-border-radius: 50%;
+        border-radius: 50%;
+        margin-left: -3px;
+        left: 50%;
+        bottom: 10px;
+        background-color: #F8BB86; }
+    .sweet-alert .sa-icon.sa-info {
+      border-color: #C9DAE1; }
+      .sweet-alert .sa-icon.sa-info::before {
+        content: "";
+        position: absolute;
+        width: 5px;
+        height: 29px;
+        left: 50%;
+        bottom: 17px;
+        border-radius: 2px;
+        margin-left: -2px;
+        background-color: #C9DAE1; }
+      .sweet-alert .sa-icon.sa-info::after {
+        content: "";
+        position: absolute;
+        width: 7px;
+        height: 7px;
+        border-radius: 50%;
+        margin-left: -3px;
+        top: 19px;
+        background-color: #C9DAE1; }
+    .sweet-alert .sa-icon.sa-success {
+      border-color: #A5DC86; }
+      .sweet-alert .sa-icon.sa-success::before, .sweet-alert .sa-icon.sa-success::after {
+        content: '';
+        -webkit-border-radius: 40px;
+        border-radius: 40px;
+        border-radius: 50%;
+        position: absolute;
+        width: 60px;
+        height: 120px;
+        background: white;
+        -webkit-transform: rotate(45deg);
+        transform: rotate(45deg); }
+      .sweet-alert .sa-icon.sa-success::before {
+        -webkit-border-radius: 120px 0 0 120px;
+        border-radius: 120px 0 0 120px;
+        top: -7px;
+        left: -33px;
+        -webkit-transform: rotate(-45deg);
+        transform: rotate(-45deg);
+        -webkit-transform-origin: 60px 60px;
+        transform-origin: 60px 60px; }
+      .sweet-alert .sa-icon.sa-success::after {
+        -webkit-border-radius: 0 120px 120px 0;
+        border-radius: 0 120px 120px 0;
+        top: -11px;
+        left: 30px;
+        -webkit-transform: rotate(-45deg);
+        transform: rotate(-45deg);
+        -webkit-transform-origin: 0px 60px;
+        transform-origin: 0px 60px; }
+      .sweet-alert .sa-icon.sa-success .sa-placeholder {
+        width: 80px;
+        height: 80px;
+        border: 4px solid rgba(165, 220, 134, 0.2);
+        -webkit-border-radius: 40px;
+        border-radius: 40px;
+        border-radius: 50%;
+        box-sizing: content-box;
+        position: absolute;
+        left: -4px;
+        top: -4px;
+        z-index: 2; }
+      .sweet-alert .sa-icon.sa-success .sa-fix {
+        width: 5px;
+        height: 90px;
+        background-color: white;
+        position: absolute;
+        left: 28px;
+        top: 8px;
+        z-index: 1;
+        -webkit-transform: rotate(-45deg);
+        transform: rotate(-45deg); }
+      .sweet-alert .sa-icon.sa-success .sa-line {
+        height: 5px;
+        background-color: #A5DC86;
+        display: block;
+        border-radius: 2px;
+        position: absolute;
+        z-index: 2; }
+        .sweet-alert .sa-icon.sa-success .sa-line.sa-tip {
+          width: 25px;
+          left: 14px;
+          top: 46px;
+          -webkit-transform: rotate(45deg);
+          transform: rotate(45deg); }
+        .sweet-alert .sa-icon.sa-success .sa-line.sa-long {
+          width: 47px;
+          right: 8px;
+          top: 38px;
+          -webkit-transform: rotate(-45deg);
+          transform: rotate(-45deg); }
+    .sweet-alert .sa-icon.sa-custom {
+      background-size: contain;
+      border-radius: 0;
+      border: none;
+      background-position: center center;
+      background-repeat: no-repeat; }
+
+/*
+ * Animations
+ */
+@-webkit-keyframes showSweetAlert {
+  0% {
+    transform: scale(0.7);
+    -webkit-transform: scale(0.7); }
+  45% {
+    transform: scale(1.05);
+    -webkit-transform: scale(1.05); }
+  80% {
+    transform: scale(0.95);
+    -webkit-transform: scale(0.95); }
+  100% {
+    transform: scale(1);
+    -webkit-transform: scale(1); } }
+
+@keyframes showSweetAlert {
+  0% {
+    transform: scale(0.7);
+    -webkit-transform: scale(0.7); }
+  45% {
+    transform: scale(1.05);
+    -webkit-transform: scale(1.05); }
+  80% {
+    transform: scale(0.95);
+    -webkit-transform: scale(0.95); }
+  100% {
+    transform: scale(1);
+    -webkit-transform: scale(1); } }
+
+@-webkit-keyframes hideSweetAlert {
+  0% {
+    transform: scale(1);
+    -webkit-transform: scale(1); }
+  100% {
+    transform: scale(0.5);
+    -webkit-transform: scale(0.5); } }
+
+@keyframes hideSweetAlert {
+  0% {
+    transform: scale(1);
+    -webkit-transform: scale(1); }
+  100% {
+    transform: scale(0.5);
+    -webkit-transform: scale(0.5); } }
+
+@-webkit-keyframes slideFromTop {
+  0% {
+    top: 0%; }
+  100% {
+    top: 50%; } }
+
+@keyframes slideFromTop {
+  0% {
+    top: 0%; }
+  100% {
+    top: 50%; } }
+
+@-webkit-keyframes slideToTop {
+  0% {
+    top: 50%; }
+  100% {
+    top: 0%; } }
+
+@keyframes slideToTop {
+  0% {
+    top: 50%; }
+  100% {
+    top: 0%; } }
+
+@-webkit-keyframes slideFromBottom {
+  0% {
+    top: 70%; }
+  100% {
+    top: 50%; } }
+
+@keyframes slideFromBottom {
+  0% {
+    top: 70%; }
+  100% {
+    top: 50%; } }
+
+@-webkit-keyframes slideToBottom {
+  0% {
+    top: 50%; }
+  100% {
+    top: 70%; } }
+
+@keyframes slideToBottom {
+  0% {
+    top: 50%; }
+  100% {
+    top: 70%; } }
+
+.showSweetAlert[data-animation=pop] {
+  -webkit-animation: showSweetAlert 0.3s;
+  animation: showSweetAlert 0.3s; }
+
+.showSweetAlert[data-animation=none] {
+  -webkit-animation: none;
+  animation: none; }
+
+.showSweetAlert[data-animation=slide-from-top] {
+  -webkit-animation: slideFromTop 0.3s;
+  animation: slideFromTop 0.3s; }
+
+.showSweetAlert[data-animation=slide-from-bottom] {
+  -webkit-animation: slideFromBottom 0.3s;
+  animation: slideFromBottom 0.3s; }
+
+.hideSweetAlert[data-animation=pop] {
+  -webkit-animation: hideSweetAlert 0.2s;
+  animation: hideSweetAlert 0.2s; }
+
+.hideSweetAlert[data-animation=none] {
+  -webkit-animation: none;
+  animation: none; }
+
+.hideSweetAlert[data-animation=slide-from-top] {
+  -webkit-animation: slideToTop 0.4s;
+  animation: slideToTop 0.4s; }
+
+.hideSweetAlert[data-animation=slide-from-bottom] {
+  -webkit-animation: slideToBottom 0.3s;
+  animation: slideToBottom 0.3s; }
+
+@-webkit-keyframes animateSuccessTip {
+  0% {
+    width: 0;
+    left: 1px;
+    top: 19px; }
+  54% {
+    width: 0;
+    left: 1px;
+    top: 19px; }
+  70% {
+    width: 50px;
+    left: -8px;
+    top: 37px; }
+  84% {
+    width: 17px;
+    left: 21px;
+    top: 48px; }
+  100% {
+    width: 25px;
+    left: 14px;
+    top: 45px; } }
+
+@keyframes animateSuccessTip {
+  0% {
+    width: 0;
+    left: 1px;
+    top: 19px; }
+  54% {
+    width: 0;
+    left: 1px;
+    top: 19px; }
+  70% {
+    width: 50px;
+    left: -8px;
+    top: 37px; }
+  84% {
+    width: 17px;
+    left: 21px;
+    top: 48px; }
+  100% {
+    width: 25px;
+    left: 14px;
+    top: 45px; } }
+
+@-webkit-keyframes animateSuccessLong {
+  0% {
+    width: 0;
+    right: 46px;
+    top: 54px; }
+  65% {
+    width: 0;
+    right: 46px;
+    top: 54px; }
+  84% {
+    width: 55px;
+    right: 0px;
+    top: 35px; }
+  100% {
+    width: 47px;
+    right: 8px;
+    top: 38px; } }
+
+@keyframes animateSuccessLong {
+  0% {
+    width: 0;
+    right: 46px;
+    top: 54px; }
+  65% {
+    width: 0;
+    right: 46px;
+    top: 54px; }
+  84% {
+    width: 55px;
+    right: 0px;
+    top: 35px; }
+  100% {
+    width: 47px;
+    right: 8px;
+    top: 38px; } }
+
+@-webkit-keyframes rotatePlaceholder {
+  0% {
+    transform: rotate(-45deg);
+    -webkit-transform: rotate(-45deg); }
+  5% {
+    transform: rotate(-45deg);
+    -webkit-transform: rotate(-45deg); }
+  12% {
+    transform: rotate(-405deg);
+    -webkit-transform: rotate(-405deg); }
+  100% {
+    transform: rotate(-405deg);
+    -webkit-transform: rotate(-405deg); } }
+
+@keyframes rotatePlaceholder {
+  0% {
+    transform: rotate(-45deg);
+    -webkit-transform: rotate(-45deg); }
+  5% {
+    transform: rotate(-45deg);
+    -webkit-transform: rotate(-45deg); }
+  12% {
+    transform: rotate(-405deg);
+    -webkit-transform: rotate(-405deg); }
+  100% {
+    transform: rotate(-405deg);
+    -webkit-transform: rotate(-405deg); } }
+
+.animateSuccessTip {
+  -webkit-animation: animateSuccessTip 0.75s;
+  animation: animateSuccessTip 0.75s; }
+
+.animateSuccessLong {
+  -webkit-animation: animateSuccessLong 0.75s;
+  animation: animateSuccessLong 0.75s; }
+
+.sa-icon.sa-success.animate::after {
+  -webkit-animation: rotatePlaceholder 4.25s ease-in;
+  animation: rotatePlaceholder 4.25s ease-in; }
+
+@-webkit-keyframes animateErrorIcon {
+  0% {
+    transform: rotateX(100deg);
+    -webkit-transform: rotateX(100deg);
+    opacity: 0; }
+  100% {
+    transform: rotateX(0deg);
+    -webkit-transform: rotateX(0deg);
+    opacity: 1; } }
+
+@keyframes animateErrorIcon {
+  0% {
+    transform: rotateX(100deg);
+    -webkit-transform: rotateX(100deg);
+    opacity: 0; }
+  100% {
+    transform: rotateX(0deg);
+    -webkit-transform: rotateX(0deg);
+    opacity: 1; } }
+
+.animateErrorIcon {
+  -webkit-animation: animateErrorIcon 0.5s;
+  animation: animateErrorIcon 0.5s; }
+
+@-webkit-keyframes animateXMark {
+  0% {
+    transform: scale(0.4);
+    -webkit-transform: scale(0.4);
+    margin-top: 26px;
+    opacity: 0; }
+  50% {
+    transform: scale(0.4);
+    -webkit-transform: scale(0.4);
+    margin-top: 26px;
+    opacity: 0; }
+  80% {
+    transform: scale(1.15);
+    -webkit-transform: scale(1.15);
+    margin-top: -6px; }
+  100% {
+    transform: scale(1);
+    -webkit-transform: scale(1);
+    margin-top: 0;
+    opacity: 1; } }
+
+@keyframes animateXMark {
+  0% {
+    transform: scale(0.4);
+    -webkit-transform: scale(0.4);
+    margin-top: 26px;
+    opacity: 0; }
+  50% {
+    transform: scale(0.4);
+    -webkit-transform: scale(0.4);
+    margin-top: 26px;
+    opacity: 0; }
+  80% {
+    transform: scale(1.15);
+    -webkit-transform: scale(1.15);
+    margin-top: -6px; }
+  100% {
+    transform: scale(1);
+    -webkit-transform: scale(1);
+    margin-top: 0;
+    opacity: 1; } }
+
+.animateXMark {
+  -webkit-animation: animateXMark 0.5s;
+  animation: animateXMark 0.5s; }
+
+@-webkit-keyframes pulseWarning {
+  0% {
+    border-color: #F8D486; }
+  100% {
+    border-color: #F8BB86; } }
+
+@keyframes pulseWarning {
+  0% {
+    border-color: #F8D486; }
+  100% {
+    border-color: #F8BB86; } }
+
+.pulseWarning {
+  -webkit-animation: pulseWarning 0.75s infinite alternate;
+  animation: pulseWarning 0.75s infinite alternate; }
+
+@-webkit-keyframes pulseWarningIns {
+  0% {
+    background-color: #F8D486; }
+  100% {
+    background-color: #F8BB86; } }
+
+@keyframes pulseWarningIns {
+  0% {
+    background-color: #F8D486; }
+  100% {
+    background-color: #F8BB86; } }
+
+.pulseWarningIns {
+  -webkit-animation: pulseWarningIns 0.75s infinite alternate;
+  animation: pulseWarningIns 0.75s infinite alternate; }
+
+/* Internet Explorer 9 has some special quirks that are fixed here */
+/* The icons are not animated. */
+/* This file is automatically merged into sweet-alert.min.js through Gulp */
+/* Error icon */
+.sweet-alert .sa-icon.sa-error .sa-line.sa-left {
+  -ms-transform: rotate(45deg) \9; }
+
+.sweet-alert .sa-icon.sa-error .sa-line.sa-right {
+  -ms-transform: rotate(-45deg) \9; }
+
+/* Success icon */
+.sweet-alert .sa-icon.sa-success {
+  border-color: transparent\9; }
+
+.sweet-alert .sa-icon.sa-success .sa-line.sa-tip {
+  -ms-transform: rotate(45deg) \9; }
+
+.sweet-alert .sa-icon.sa-success .sa-line.sa-long {
+  -ms-transform: rotate(-45deg) \9; }
diff --git a/src/main/webapp/bower_components/sweetalert/sweetalert.min.js b/src/main/webapp/bower_components/sweetalert/sweetalert.min.js
new file mode 100644
index 0000000..3e4e7ff
--- /dev/null
+++ b/src/main/webapp/bower_components/sweetalert/sweetalert.min.js
@@ -0,0 +1 @@
+!function(e,t,n){"use strict";!function o(e,t,n){function a(s,l){if(!t[s]){if(!e[s]){var i="function"==typeof require&&require;if(!l&&i)return i(s,!0);if(r)return r(s,!0);var u=new Error("Cannot find module '"+s+"'");throw u.code="MODULE_NOT_FOUND",u}var c=t[s]={exports:{}};e[s][0].call(c.exports,function(t){var n=e[s][1][t];return a(n?n:t)},c,c.exports,o,e,t,n)}return t[s].exports}for(var r="function"==typeof require&&require,s=0;s<n.length;s++)a(n[s]);return a}({1:[function(o){var a,r,s,l,i=function(e){return e&&e.__esModule?e:{"default":e}},u=o("./modules/handle-dom"),c=o("./modules/utils"),d=o("./modules/handle-swal-dom"),f=o("./modules/handle-click"),p=o("./modules/handle-key"),m=i(p),v=o("./modules/default-params"),y=i(v),h=o("./modules/set-params"),g=i(h);s=l=function(){function o(e){var t=s;return t[e]===n?y["default"][e]:t[e]}var s=arguments[0];if(u.addClass(t.body,"stop-scrolling"),d.resetInput(),s===n)return c.logStr("SweetAlert expects at least 1 attribute!"),!1;var l=c.extend({},y["default"]);switch(typeof s){case"string":l.title=s,l.text=arguments[1]||"",l.type=arguments[2]||"";break;case"object":if(s.title===n)return c.logStr('Missing "title" argument!'),!1;l.title=s.title;for(var i in y["default"])l[i]=o(i);l.confirmButtonText=l.showCancelButton?"Confirm":y["default"].confirmButtonText,l.confirmButtonText=o("confirmButtonText"),l.doneFunction=arguments[1]||null;break;default:return c.logStr('Unexpected type of argument! Expected "string" or "object", got '+typeof s),!1}g["default"](l),d.fixVerticalPosition(),d.openModal(arguments[1]);for(var p=d.getModal(),v=p.querySelectorAll("button"),h=["onclick","onmouseover","onmouseout","onmousedown","onmouseup","onfocus"],b=function(e){return f.handleButton(e,l,p)},w=0;w<v.length;w++)for(var C=0;C<h.length;C++){var S=h[C];v[w][S]=b}d.getOverlay().onclick=b,a=e.onkeydown;var x=function(e){return m["default"](e,l,p)};e.onkeydown=x,e.onfocus=function(){setTimeout(function(){r!==n&&(r.focus(),r=n)},0)}},s.setDefaults=l.setDefaults=function(e){if(!e)throw new Error("userParams is required");if("object"!=typeof e)throw new Error("userParams has to be a object");c.extend(y["default"],e)},s.close=l.close=function(){var o=d.getModal();u.fadeOut(d.getOverlay(),5),u.fadeOut(o,5),u.removeClass(o,"showSweetAlert"),u.addClass(o,"hideSweetAlert"),u.removeClass(o,"visible");var s=o.querySelector(".sa-icon.sa-success");u.removeClass(s,"animate"),u.removeClass(s.querySelector(".sa-tip"),"animateSuccessTip"),u.removeClass(s.querySelector(".sa-long"),"animateSuccessLong");var l=o.querySelector(".sa-icon.sa-error");u.removeClass(l,"animateErrorIcon"),u.removeClass(l.querySelector(".sa-x-mark"),"animateXMark");var i=o.querySelector(".sa-icon.sa-warning");return u.removeClass(i,"pulseWarning"),u.removeClass(i.querySelector(".sa-body"),"pulseWarningIns"),u.removeClass(i.querySelector(".sa-dot"),"pulseWarningIns"),setTimeout(function(){var e=o.getAttribute("data-custom-class");u.removeClass(o,e)},300),u.removeClass(t.body,"stop-scrolling"),e.onkeydown=a,e.previousActiveElement&&e.previousActiveElement.focus(),r=n,clearTimeout(o.timeout),!0},s.showInputError=l.showInputError=function(e){var t=d.getModal(),n=t.querySelector(".sa-input-error");u.addClass(n,"show");var o=t.querySelector(".sa-error-container");u.addClass(o,"show"),o.querySelector("p").innerHTML=e,t.querySelector("input").focus()},s.resetInputError=l.resetInputError=function(e){if(e&&13===e.keyCode)return!1;var t=d.getModal(),n=t.querySelector(".sa-input-error");u.removeClass(n,"show");var o=t.querySelector(".sa-error-container");u.removeClass(o,"show")},"undefined"!=typeof e?e.sweetAlert=e.swal=s:c.logStr("SweetAlert is a frontend module!")},{"./modules/default-params":2,"./modules/handle-click":3,"./modules/handle-dom":4,"./modules/handle-key":5,"./modules/handle-swal-dom":6,"./modules/set-params":8,"./modules/utils":9}],2:[function(e,t,n){Object.defineProperty(n,"__esModule",{value:!0});var o={title:"",text:"",type:null,allowOutsideClick:!1,showConfirmButton:!0,showCancelButton:!1,closeOnConfirm:!0,closeOnCancel:!0,confirmButtonText:"OK",confirmButtonColor:"#AEDEF4",cancelButtonText:"Cancel",imageUrl:null,imageSize:null,timer:null,customClass:"",html:!1,animation:!0,allowEscapeKey:!0,inputType:"text",inputPlaceholder:"",inputValue:""};n["default"]=o,t.exports=n["default"]},{}],3:[function(t,n,o){Object.defineProperty(o,"__esModule",{value:!0});var a=t("./utils"),r=(t("./handle-swal-dom"),t("./handle-dom")),s=function(t,n,o){function s(e){m&&n.confirmButtonColor&&(p.style.backgroundColor=e)}var u,c,d,f=t||e.event,p=f.target||f.srcElement,m=-1!==p.className.indexOf("confirm"),v=-1!==p.className.indexOf("sweet-overlay"),y=r.hasClass(o,"visible"),h=n.doneFunction&&"true"===o.getAttribute("data-has-done-function");switch(m&&n.confirmButtonColor&&(u=n.confirmButtonColor,c=a.colorLuminance(u,-.04),d=a.colorLuminance(u,-.14)),f.type){case"mouseover":s(c);break;case"mouseout":s(u);break;case"mousedown":s(d);break;case"mouseup":s(c);break;case"focus":var g=o.querySelector("button.confirm"),b=o.querySelector("button.cancel");m?b.style.boxShadow="none":g.style.boxShadow="none";break;case"click":var w=o===p,C=r.isDescendant(o,p);if(!w&&!C&&y&&!n.allowOutsideClick)break;m&&h&&y?l(o,n):h&&y||v?i(o,n):r.isDescendant(o,p)&&"BUTTON"===p.tagName&&sweetAlert.close()}},l=function(e,t){var n=!0;r.hasClass(e,"show-input")&&(n=e.querySelector("input").value,n||(n="")),t.doneFunction(n),t.closeOnConfirm&&sweetAlert.close()},i=function(e,t){var n=String(t.doneFunction).replace(/\s/g,""),o="function("===n.substring(0,9)&&")"!==n.substring(9,10);o&&t.doneFunction(!1),t.closeOnCancel&&sweetAlert.close()};o["default"]={handleButton:s,handleConfirm:l,handleCancel:i},n.exports=o["default"]},{"./handle-dom":4,"./handle-swal-dom":6,"./utils":9}],4:[function(n,o,a){Object.defineProperty(a,"__esModule",{value:!0});var r=function(e,t){return new RegExp(" "+t+" ").test(" "+e.className+" ")},s=function(e,t){r(e,t)||(e.className+=" "+t)},l=function(e,t){var n=" "+e.className.replace(/[\t\r\n]/g," ")+" ";if(r(e,t)){for(;n.indexOf(" "+t+" ")>=0;)n=n.replace(" "+t+" "," ");e.className=n.replace(/^\s+|\s+$/g,"")}},i=function(e){var n=t.createElement("div");return n.appendChild(t.createTextNode(e)),n.innerHTML},u=function(e){e.style.opacity="",e.style.display="block"},c=function(e){if(e&&!e.length)return u(e);for(var t=0;t<e.length;++t)u(e[t])},d=function(e){e.style.opacity="",e.style.display="none"},f=function(e){if(e&&!e.length)return d(e);for(var t=0;t<e.length;++t)d(e[t])},p=function(e,t){for(var n=t.parentNode;null!==n;){if(n===e)return!0;n=n.parentNode}return!1},m=function(e){e.style.left="-9999px",e.style.display="block";var t,n=e.clientHeight;return t="undefined"!=typeof getComputedStyle?parseInt(getComputedStyle(e).getPropertyValue("padding-top"),10):parseInt(e.currentStyle.padding),e.style.left="",e.style.display="none","-"+parseInt((n+t)/2)+"px"},v=function(e,t){if(+e.style.opacity<1){t=t||16,e.style.opacity=0,e.style.display="block";var n=+new Date,o=function(e){function t(){return e.apply(this,arguments)}return t.toString=function(){return e.toString()},t}(function(){e.style.opacity=+e.style.opacity+(new Date-n)/100,n=+new Date,+e.style.opacity<1&&setTimeout(o,t)});o()}e.style.display="block"},y=function(e,t){t=t||16,e.style.opacity=1;var n=+new Date,o=function(e){function t(){return e.apply(this,arguments)}return t.toString=function(){return e.toString()},t}(function(){e.style.opacity=+e.style.opacity-(new Date-n)/100,n=+new Date,+e.style.opacity>0?setTimeout(o,t):e.style.display="none"});o()},h=function(n){if("function"==typeof MouseEvent){var o=new MouseEvent("click",{view:e,bubbles:!1,cancelable:!0});n.dispatchEvent(o)}else if(t.createEvent){var a=t.createEvent("MouseEvents");a.initEvent("click",!1,!1),n.dispatchEvent(a)}else t.createEventObject?n.fireEvent("onclick"):"function"==typeof n.onclick&&n.onclick()},g=function(t){"function"==typeof t.stopPropagation?(t.stopPropagation(),t.preventDefault()):e.event&&e.event.hasOwnProperty("cancelBubble")&&(e.event.cancelBubble=!0)};a.hasClass=r,a.addClass=s,a.removeClass=l,a.escapeHtml=i,a._show=u,a.show=c,a._hide=d,a.hide=f,a.isDescendant=p,a.getTopMargin=m,a.fadeIn=v,a.fadeOut=y,a.fireClick=h,a.stopEventPropagation=g},{}],5:[function(t,o,a){Object.defineProperty(a,"__esModule",{value:!0});var r=t("./handle-dom"),s=t("./handle-swal-dom"),l=function(t,o,a){var l=t||e.event,i=l.keyCode||l.which,u=a.querySelector("button.confirm"),c=a.querySelector("button.cancel"),d=a.querySelectorAll("button[tabindex]");if(-1!==[9,13,32,27].indexOf(i)){for(var f=l.target||l.srcElement,p=-1,m=0;m<d.length;m++)if(f===d[m]){p=m;break}9===i?(f=-1===p?u:p===d.length-1?d[0]:d[p+1],r.stopEventPropagation(l),f.focus(),o.confirmButtonColor&&s.setFocusStyle(f,o.confirmButtonColor)):13===i?("INPUT"===f.tagName&&(f=u,u.focus()),f=-1===p?u:n):27===i&&o.allowEscapeKey===!0?(f=c,r.fireClick(f,l)):f=n}};a["default"]=l,o.exports=a["default"]},{"./handle-dom":4,"./handle-swal-dom":6}],6:[function(n,o,a){var r=function(e){return e&&e.__esModule?e:{"default":e}};Object.defineProperty(a,"__esModule",{value:!0});var s=n("./utils"),l=n("./handle-dom"),i=n("./default-params"),u=r(i),c=n("./injected-html"),d=r(c),f=".sweet-alert",p=".sweet-overlay",m=function(){var e=t.createElement("div");for(e.innerHTML=d["default"];e.firstChild;)t.body.appendChild(e.firstChild)},v=function(e){function t(){return e.apply(this,arguments)}return t.toString=function(){return e.toString()},t}(function(){var e=t.querySelector(f);return e||(m(),e=v()),e}),y=function(){var e=v();return e?e.querySelector("input"):void 0},h=function(){return t.querySelector(p)},g=function(e,t){var n=s.hexToRgb(t);e.style.boxShadow="0 0 2px rgba("+n+", 0.8), inset 0 0 0 1px rgba(0, 0, 0, 0.05)"},b=function(n){var o=v();l.fadeIn(h(),10),l.show(o),l.addClass(o,"showSweetAlert"),l.removeClass(o,"hideSweetAlert"),e.previousActiveElement=t.activeElement;var a=o.querySelector("button.confirm");a.focus(),setTimeout(function(){l.addClass(o,"visible")},500);var r=o.getAttribute("data-timer");if("null"!==r&&""!==r){var s=n;o.timeout=setTimeout(function(){var e=(s||null)&&"true"===o.getAttribute("data-has-done-function");e?s(null):sweetAlert.close()},r)}},w=function(){var e=v(),t=y();l.removeClass(e,"show-input"),t.value=u["default"].inputValue,t.setAttribute("type",u["default"].inputType),t.setAttribute("placeholder",u["default"].inputPlaceholder),C()},C=function(e){if(e&&13===e.keyCode)return!1;var t=v(),n=t.querySelector(".sa-input-error");l.removeClass(n,"show");var o=t.querySelector(".sa-error-container");l.removeClass(o,"show")},S=function(){var e=v();e.style.marginTop=l.getTopMargin(v())};a.sweetAlertInitialize=m,a.getModal=v,a.getOverlay=h,a.getInput=y,a.setFocusStyle=g,a.openModal=b,a.resetInput=w,a.resetInputError=C,a.fixVerticalPosition=S},{"./default-params":2,"./handle-dom":4,"./injected-html":7,"./utils":9}],7:[function(e,t,n){Object.defineProperty(n,"__esModule",{value:!0});var o='<div class="sweet-overlay" tabIndex="-1"></div><div class="sweet-alert"><div class="sa-icon sa-error">\n      <span class="sa-x-mark">\n        <span class="sa-line sa-left"></span>\n        <span class="sa-line sa-right"></span>\n      </span>\n    </div><div class="sa-icon sa-warning">\n      <span class="sa-body"></span>\n      <span class="sa-dot"></span>\n    </div><div class="sa-icon sa-info"></div><div class="sa-icon sa-success">\n      <span class="sa-line sa-tip"></span>\n      <span class="sa-line sa-long"></span>\n\n      <div class="sa-placeholder"></div>\n      <div class="sa-fix"></div>\n    </div><div class="sa-icon sa-custom"></div><h2>Title</h2>\n    <p>Text</p>\n    <fieldset>\n      <input type="text" tabIndex="3" />\n      <div class="sa-input-error"></div>\n    </fieldset><div class="sa-error-container">\n      <div class="icon">!</div>\n      <p>Not valid!</p>\n    </div><div class="sa-button-container">\n      <button class="cancel" tabIndex="2">Cancel</button>\n      <button class="confirm" tabIndex="1">OK</button>\n    </div></div>';n["default"]=o,t.exports=n["default"]},{}],8:[function(e,t,o){Object.defineProperty(o,"__esModule",{value:!0});var a=e("./utils"),r=e("./handle-swal-dom"),s=e("./handle-dom"),l=["error","warning","info","success","input","prompt"],i=function(e){var t=r.getModal(),o=t.querySelector("h2"),i=t.querySelector("p"),u=t.querySelector("button.cancel"),c=t.querySelector("button.confirm");if(o.innerHTML=e.html?e.title:s.escapeHtml(e.title).split("\n").join("<br>"),i.innerHTML=e.html?e.text:s.escapeHtml(e.text||"").split("\n").join("<br>"),e.text&&s.show(i),e.customClass)s.addClass(t,e.customClass),t.setAttribute("data-custom-class",e.customClass);else{var d=t.getAttribute("data-custom-class");s.removeClass(t,d),t.setAttribute("data-custom-class","")}if(s.hide(t.querySelectorAll(".sa-icon")),e.type&&!a.isIE8()){var f=function(){for(var o=!1,a=0;a<l.length;a++)if(e.type===l[a]){o=!0;break}if(!o)return logStr("Unknown alert type: "+e.type),{v:!1};var i=["success","error","warning","info"],u=n;-1!==i.indexOf(e.type)&&(u=t.querySelector(".sa-icon.sa-"+e.type),s.show(u));var c=r.getInput();switch(e.type){case"success":s.addClass(u,"animate"),s.addClass(u.querySelector(".sa-tip"),"animateSuccessTip"),s.addClass(u.querySelector(".sa-long"),"animateSuccessLong");break;case"error":s.addClass(u,"animateErrorIcon"),s.addClass(u.querySelector(".sa-x-mark"),"animateXMark");break;case"warning":s.addClass(u,"pulseWarning"),s.addClass(u.querySelector(".sa-body"),"pulseWarningIns"),s.addClass(u.querySelector(".sa-dot"),"pulseWarningIns");break;case"input":case"prompt":c.setAttribute("type",e.inputType),c.value=e.inputValue,c.setAttribute("placeholder",e.inputPlaceholder),s.addClass(t,"show-input"),setTimeout(function(){c.focus(),c.addEventListener("keyup",swal.resetInputError)},400)}}();if("object"==typeof f)return f.v}if(e.imageUrl){var p=t.querySelector(".sa-icon.sa-custom");p.style.backgroundImage="url("+e.imageUrl+")",s.show(p);var m=80,v=80;if(e.imageSize){var y=e.imageSize.toString().split("x"),h=y[0],g=y[1];h&&g?(m=h,v=g):logStr("Parameter imageSize expects value with format WIDTHxHEIGHT, got "+e.imageSize)}p.setAttribute("style",p.getAttribute("style")+"width:"+m+"px; height:"+v+"px")}t.setAttribute("data-has-cancel-button",e.showCancelButton),e.showCancelButton?u.style.display="inline-block":s.hide(u),t.setAttribute("data-has-confirm-button",e.showConfirmButton),e.showConfirmButton?c.style.display="inline-block":s.hide(c),e.cancelButtonText&&(u.innerHTML=s.escapeHtml(e.cancelButtonText)),e.confirmButtonText&&(c.innerHTML=s.escapeHtml(e.confirmButtonText)),e.confirmButtonColor&&(c.style.backgroundColor=e.confirmButtonColor,r.setFocusStyle(c,e.confirmButtonColor)),t.setAttribute("data-allow-outside-click",e.allowOutsideClick);var b=e.doneFunction?!0:!1;t.setAttribute("data-has-done-function",b),e.animation?"string"==typeof e.animation?t.setAttribute("data-animation",e.animation):t.setAttribute("data-animation","pop"):t.setAttribute("data-animation","none"),t.setAttribute("data-timer",e.timer)};o["default"]=i,t.exports=o["default"]},{"./handle-dom":4,"./handle-swal-dom":6,"./utils":9}],9:[function(t,n,o){Object.defineProperty(o,"__esModule",{value:!0});var a=function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n]);return e},r=function(e){var t=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(e);return t?parseInt(t[1],16)+", "+parseInt(t[2],16)+", "+parseInt(t[3],16):null},s=function(){return e.attachEvent&&!e.addEventListener},l=function(t){e.console&&e.console.log("SweetAlert: "+t)},i=function(e,t){e=String(e).replace(/[^0-9a-f]/gi,""),e.length<6&&(e=e[0]+e[0]+e[1]+e[1]+e[2]+e[2]),t=t||0;var n,o,a="#";for(o=0;3>o;o++)n=parseInt(e.substr(2*o,2),16),n=Math.round(Math.min(Math.max(0,n+n*t),255)).toString(16),a+=("00"+n).substr(n.length);return a};o.extend=a,o.hexToRgb=r,o.isIE8=s,o.logStr=l,o.colorLuminance=i},{}]},{},[1]),"function"==typeof define&&define.amd?define(function(){return sweetAlert}):"undefined"!=typeof module&&module.exports&&(module.exports=sweetAlert)}(window,document);
\ No newline at end of file
diff --git a/src/main/webapp/js/ajaxfileupload.js b/src/main/webapp/js/ajaxfileupload.js
new file mode 100644
index 0000000..4021e99
--- /dev/null
+++ b/src/main/webapp/js/ajaxfileupload.js
@@ -0,0 +1,202 @@
+
+jQuery.extend({
+	
+
+    createUploadIframe: function(id, uri)
+	{
+			//create frame
+            var frameId = 'jUploadFrame' + id;
+            var iframeHtml = '<iframe id="' + frameId + '" name="' + frameId + '" style="position:absolute; top:-9999px; left:-9999px"';
+			if(window.ActiveXObject)
+			{
+                if(typeof uri== 'boolean'){
+					iframeHtml += ' src="' + 'javascript:false' + '"';
+
+                }
+                else if(typeof uri== 'string'){
+					iframeHtml += ' src="' + uri + '"';
+
+                }	
+			}
+			iframeHtml += ' />';
+			jQuery(iframeHtml).appendTo(document.body);
+
+            return jQuery('#' + frameId).get(0);			
+    },
+    createUploadForm: function(id, fileElementId)
+	{
+		//create form	
+		var formId = 'jUploadForm' + id;
+		var fileId = 'jUploadFile' + id;
+		var form = jQuery('<form  action="" method="POST" name="' + formId + '" id="' + formId + '" enctype="multipart/form-data"></form>');	
+		var oldElement = jQuery('#' + fileElementId);
+		var newElement = jQuery(oldElement).clone();
+		jQuery(oldElement).attr('id', fileId);
+		jQuery(oldElement).before(newElement);
+		jQuery(oldElement).appendTo(form);
+		//set attributes
+		jQuery(form).css('position', 'absolute');
+		jQuery(form).css('top', '-1200px');
+		jQuery(form).css('left', '-1200px');
+		jQuery(form).appendTo('body');		
+		return form;
+    },
+
+    ajaxFileUpload: function(s) {
+        // TODO introduce global settings, allowing the client to modify them for all requests, not only timeout		
+        s = jQuery.extend({}, jQuery.ajaxSettings, s);
+        var id = new Date().getTime()        
+		var form = jQuery.createUploadForm(id, s.fileElementId);
+		var io = jQuery.createUploadIframe(id, s.secureuri);
+		var frameId = 'jUploadFrame' + id;
+		var formId = 'jUploadForm' + id;		
+        // Watch for a new set of requests
+        if ( s.global && ! jQuery.active++ )
+		{
+			jQuery.event.trigger( "ajaxStart" );
+		}            
+        var requestDone = false;
+        // Create the request object
+        var xml = {}   
+        if ( s.global )
+            jQuery.event.trigger("ajaxSend", [xml, s]);
+        // Wait for a response to come back
+        var uploadCallback = function(isTimeout)
+		{			
+			var io = document.getElementById(frameId);
+            try 
+			{				
+				if(io.contentWindow)
+				{
+					 xml.responseText = io.contentWindow.document.body?io.contentWindow.document.body.innerHTML:null;
+                	 xml.responseXML = io.contentWindow.document.XMLDocument?io.contentWindow.document.XMLDocument:io.contentWindow.document;
+					 
+				}else if(io.contentDocument)
+				{
+					 xml.responseText = io.contentDocument.document.body?io.contentDocument.document.body.innerHTML:null;
+                	xml.responseXML = io.contentDocument.document.XMLDocument?io.contentDocument.document.XMLDocument:io.contentDocument.document;
+				}						
+            }catch(e)
+			{
+				jQuery.handleError(s, xml, null, e);
+			}
+            if ( xml || isTimeout == "timeout") 
+			{				
+                requestDone = true;
+                var status;
+                try {
+                    status = isTimeout != "timeout" ? "success" : "error";
+                    // Make sure that the request was successful or notmodified
+                    if ( status != "error" )
+					{
+                        // process the data (runs the xml through httpData regardless of callback)
+                        var data = jQuery.uploadHttpData( xml, s.dataType );    
+                        // If a local callback was specified, fire it and pass it the data
+                        if ( s.success )
+                            s.success( data, status );
+    
+                        // Fire the global callback
+                        if( s.global )
+                            jQuery.event.trigger( "ajaxSuccess", [xml, s] );
+                    } else
+                        jQuery.handleError(s, xml, status);
+                } catch(e) 
+				{
+                    status = "error";
+                    jQuery.handleError(s, xml, status, e);
+                }
+
+                // The request was completed
+                if( s.global )
+                    jQuery.event.trigger( "ajaxComplete", [xml, s] );
+
+                // Handle the global AJAX counter
+                if ( s.global && ! --jQuery.active )
+                    jQuery.event.trigger( "ajaxStop" );
+
+                // Process result
+                if ( s.complete )
+                    s.complete(xml, status);
+
+                jQuery(io).unbind()
+
+                setTimeout(function()
+									{	try 
+										{
+											jQuery(io).remove();
+											jQuery(form).remove();	
+											
+										} catch(e) 
+										{
+											jQuery.handleError(s, xml, null, e);
+										}									
+
+									}, 100)
+
+                xml = null
+
+            }
+        }
+        // Timeout checker
+        if ( s.timeout > 0 ) 
+		{
+            setTimeout(function(){
+                // Check to see if the request is still happening
+                if( !requestDone ) uploadCallback( "timeout" );
+            }, s.timeout);
+        }
+        try 
+		{
+
+			var form = jQuery('#' + formId);
+			jQuery(form).attr('action', s.url);
+			jQuery(form).attr('method', 'POST');
+			jQuery(form).attr('target', frameId);
+            if(form.encoding)
+			{
+				jQuery(form).attr('encoding', 'multipart/form-data');      			
+            }
+            else
+			{	
+				jQuery(form).attr('enctype', 'multipart/form-data');			
+            }			
+            jQuery(form).submit();
+
+        } catch(e) 
+		{			
+            jQuery.handleError(s, xml, null, e);
+        }
+		
+		jQuery('#' + frameId).load(uploadCallback	);
+        return {abort: function () {}};	
+
+    },
+
+    uploadHttpData: function( r, type ) {
+        var data = !type;
+        data = type == "xml" || data ? r.responseXML : r.responseText;
+        // If the type is "script", eval it in global context
+        if ( type == "script" )
+            jQuery.globalEval( data );
+        // Get the JavaScript object, if JSON is used.
+        if ( type == "json" )
+            eval( "data = " + data );
+        // evaluate scripts within html
+        if ( type == "html" )
+            jQuery("<div>").html(data).evalScripts();
+
+        return data;
+    },
+    handleError: function( s, xhr, status, e ) 		{
+    	// If a local callback was specified, fire it
+    			if ( s.error ) {
+    				s.error.call( s.context || s, xhr, status, e );
+    			}
+
+    			// Fire the global callback
+    			if ( s.global ) {
+    				(s.context ? jQuery(s.context) : jQuery.event).trigger( "ajaxError", [xhr, s, e] );
+    			}
+    }
+})
+
diff --git a/src/main/webapp/js/main.js b/src/main/webapp/js/main.js
index 732ab89..45435f6 100644
--- a/src/main/webapp/js/main.js
+++ b/src/main/webapp/js/main.js
@@ -1,7 +1,7 @@
 $(document).ready(function () {
 	$('html').niceScroll({cursorcolor:"#ccc", horizrailenabled: false, enablekeyboard: false});
     dataTable = $('#dataTables-example').DataTable({
-	  dom: '<"toolbar">',
+	  //dom: '<"toolbar">',
       responsive: true,
       language: {
     		"srocessing":   "处理中...",
@@ -34,5 +34,48 @@ $(document).ready(function () {
    	  } */
     });
     
-    //$('form.searchForm').appendTo($("div.toolbar"));
+    
+    //上传控件
+    uploader = {
+		uploadUrl : null,
+		init : function() {
+			$('#uploadModal').on('hidden.bs.modal', function () {
+		    	$('.modaldownBtn').addClass('hidden')
+			});
+		    
+			$('#uploadForm').submit(function(){
+				if($('#file').val()=='') {
+					swal('通知','请选择要上传的文件','info');
+					return false;
+				}
+				$('#uploadModal').modal('hide');
+				$.ajaxFileUpload({
+					url : uploadUrl,
+					type : "POST",
+					secureuri : false,
+					fileElementId : "file",
+					dataType : "json",
+					success : function(data, status) {
+						if (data && data.resultCode == "0") {
+							swal('通知','上传成功','success');
+						} else {
+							swal('通知','上传失败','error');
+						}
+					},
+					error : function(data, status, e) {
+						swal('通知','上传失败','error');
+					}
+				});
+				return false;
+			});
+		},
+		uploadModal : function(url,tempUrl){
+	    	uploadUrl = url;
+	    	if(tempUrl!=null && tempUrl!='') {
+	    		$('.modaldownBtn').removeClass('hidden').attr('href',tempUrl);
+	    	}
+	    	$('#uploadModal').modal('toggle');
+	    }
+    };
+    uploader.init();
   });
\ No newline at end of file
diff --git a/src/main/webapp/template/car_tpl.xlsx b/src/main/webapp/template/car_tpl.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..c9708765a9fc38efca74920f69a7181ecc4d0ab3
GIT binary patch
literal 9564
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
S@lTco2VjlB!2<oyyZ-~3>CFBB

literal 0
HcmV?d00001


From 538a844524be4f1e5ddb00922a3a6cd2e6e2a4ff Mon Sep 17 00:00:00 2001
From: Freepolis <jiaye9553@gmail.com>
Date: Sat, 11 Mar 2017 20:25:09 +0800
Subject: [PATCH 03/14] =?UTF-8?q?=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 11 +++++++
 .../java/com/vm/controller/CarController.java | 19 ++++++++++--
 src/main/resources/db.properties              |  4 +--
 src/main/resources/mybatis-config.xml         | 31 +++++++++++++++++++
 src/main/webapp/WEB-INF/view/admin/nav.jsp    |  2 +-
 .../webapp/WEB-INF/view/admin/pageSplit.jsp   | 24 ++++++++++++++
 src/main/webapp/WEB-INF/view/vm/car/car.jsp   | 13 ++++----
 .../WEB-INF/view/vm/standard/standard.jsp     |  1 +
 src/main/webapp/breadcrumb.jsp                |  1 +
 target/classes/db.properties                  |  4 +--
 10 files changed, 96 insertions(+), 14 deletions(-)
 create mode 100644 src/main/webapp/WEB-INF/view/admin/pageSplit.jsp

diff --git a/pom.xml b/pom.xml
index 49e749a..cc97406 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,6 +175,17 @@
 		    <artifactId>jcl-over-slf4j</artifactId>
 		    <version>1.7.12</version>
 		</dependency>
+		<!-- pagehelper -->
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper</artifactId>
+            <version>4.1.6</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jsqlparser</groupId>
+            <artifactId>jsqlparser</artifactId>
+            <version>0.9.6</version>
+        </dependency>
         <!-- <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
diff --git a/src/main/java/com/vm/controller/CarController.java b/src/main/java/com/vm/controller/CarController.java
index b370350..58e2ac7 100644
--- a/src/main/java/com/vm/controller/CarController.java
+++ b/src/main/java/com/vm/controller/CarController.java
@@ -1,14 +1,21 @@
 package com.vm.controller;
 
+import java.util.List;
+
 import org.apache.log4j.Logger;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import com.entity.Car;
 import com.entity.Standard;
+import com.entity.User;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.vm.service.CarBiz;
 import com.vm.service.StandardBiz;
 
@@ -23,9 +30,15 @@ public class CarController {
     private StandardBiz standardBiz;
 
     @RequiresPermissions("car:query")
-    @RequestMapping("car.view")
-    public String CarView(Car car,Model m) {
-        m.addAttribute("carList", carBiz.find(car));
+    @RequestMapping("car.view/{pageNum}")
+    public String CarView(Car car,Model m,@PathVariable("pageNum") int pageNum,
+            @RequestParam(required=false,defaultValue="3") Integer pageSize) {
+    	
+    	PageHelper.startPage(pageNum, pageSize);
+    	List<Car> list =  carBiz.find(car);
+    	PageInfo<Car> page = new PageInfo<Car>(list);
+        m.addAttribute("carList", list);
+        m.addAttribute("page", page);
         return "/vm/car/car";
     }
 
diff --git a/src/main/resources/db.properties b/src/main/resources/db.properties
index 8bec0a8..4625c71 100644
--- a/src/main/resources/db.properties
+++ b/src/main/resources/db.properties
@@ -1,4 +1,4 @@
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://localhost:3306/vehicle
-jdbc.password=root
+jdbc.url=jdbc:mysql://rm-uf6ggkftngujcn480o.mysql.rds.aliyuncs.com:3306/car_sale_sh
+jdbc.password=root_123
 jdbc.username=root
diff --git a/src/main/resources/mybatis-config.xml b/src/main/resources/mybatis-config.xml
index 744f726..55dab44 100644
--- a/src/main/resources/mybatis-config.xml
+++ b/src/main/resources/mybatis-config.xml
@@ -8,4 +8,35 @@
 	<settings>  
         <setting name="logImpl" value="LOG4J"/>  
     </settings>  
+    <!-- 插件配置 -->
+    <plugins>  
+        <!-- com.github.pagehelper为PageHelper类所在包名 -->  
+        <plugin interceptor="com.github.pagehelper.PageHelper">  
+            <!-- 4.0.0以后版本可以不设置该参数 -->  
+            <!-- <property name="dialect" value="mysql"/>   -->
+            <!-- 该参数默认为false -->  
+            <!-- 设置为true时，会将RowBounds第一个参数offset当成pageNum页码使用 -->  
+            <!-- 和startPage中的pageNum效果一样-->  
+            <property name="offsetAsPageNum" value="true"/>  
+            <!-- 该参数默认为false -->  
+            <!-- 设置为true时，使用RowBounds分页会进行count查询 -->  
+            <property name="rowBoundsWithCount" value="true"/>  
+            <!-- 设置为true时，如果pageSize=0或者RowBounds.limit = 0就会查询出全部的结果 -->  
+            <!-- （相当于没有执行分页查询，但是返回结果仍然是Page类型）-->  
+            <property name="pageSizeZero" value="true"/>  
+            <!-- 3.3.0版本可用 - 分页参数合理化，默认false禁用 -->  
+            <!-- 启用合理化时，如果pageNum<1会查询第一页，如果pageNum>pages会查询最后一页 -->  
+            <!-- 禁用合理化时，如果pageNum<1或pageNum>pages会返回空数据 -->  
+            <property name="reasonable" value="true"/>  
+            <!-- 3.5.0版本可用 - 为了支持startPage(Object params)方法 -->  
+            <!-- 增加了一个`params`参数来配置参数映射，用于从Map或ServletRequest中取值 -->  
+            <!-- 可以配置pageNum,pageSize,count,pageSizeZero,reasonable,orderBy,不配置映射的用默认值 -->  
+            <!-- 不理解该含义的前提下，不要随便复制该配置 -->  
+            <property name="params" value="pageNum=start;pageSize=limit;"/>  
+            <!-- 支持通过Mapper接口参数来传递分页参数 -->  
+            <property name="supportMethodsArguments" value="true"/>  
+            <!-- always总是返回PageInfo类型,check检查返回类型是否为PageInfo,none返回Page -->  
+            <property name="returnPageInfo" value="check"/>  
+        </plugin>  
+    </plugins>  
 </configuration>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/view/admin/nav.jsp b/src/main/webapp/WEB-INF/view/admin/nav.jsp
index f609c1f..54efd31 100644
--- a/src/main/webapp/WEB-INF/view/admin/nav.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/nav.jsp
@@ -114,7 +114,7 @@
                         	</shiro:hasPermission>
                         	<shiro:hasPermission name="car">
                             <li>
-                                <a href="${pageContext.request.contextPath}/car.do/car.view"> 车辆管理</a>
+                                <a href="${pageContext.request.contextPath}/car.do/car.view/0"> 车辆管理</a>
                             </li>
                         	</shiro:hasPermission>
                         </ul>
diff --git a/src/main/webapp/WEB-INF/view/admin/pageSplit.jsp b/src/main/webapp/WEB-INF/view/admin/pageSplit.jsp
new file mode 100644
index 0000000..a8d3940
--- /dev/null
+++ b/src/main/webapp/WEB-INF/view/admin/pageSplit.jsp
@@ -0,0 +1,24 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://shiro.apache.org/tags" prefix="shiro" %>
+<!DOCTYPE html>
+  <c:if test="${page.hasPreviousPage  == true}">
+             <a href="0" class="btn btn-primary" role="button">首页</a>
+             <a href="${page.prePage}" class="btn btn-primary" role="button">上一页</a>
+        </c:if>
+        <c:forEach begin="1" end="${page.pages}" var="each">
+            <c:choose>
+                 <c:when test="${each == page.pageNum}">
+                     <a href="${each}" class="btn btn-primary" role="button">${each}</a>
+                </c:when>
+                 <c:when test="${each >= (page.pageNum - 2) && each <= (page.pageNum + 2)}">
+                  <a href="${each}" class="btn btn-primary" role="button">${each}</a>
+                </c:when>
+            </c:choose>
+        </c:forEach>
+         <c:if test="${page.hasNextPage }">
+             <a href="${page.nextPage}" class="btn btn-primary" role="button">下一页</a>
+	         <a href="${page.pages}" class="btn btn-primary" role="button">尾页</a>
+         </c:if>
+  共${page.pages}页
+ 
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/view/vm/car/car.jsp b/src/main/webapp/WEB-INF/view/vm/car/car.jsp
index 6b009d9..2da7417 100644
--- a/src/main/webapp/WEB-INF/view/vm/car/car.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/car/car.jsp
@@ -5,9 +5,6 @@
 <div id="page-wrapper">
     <div class="container-fluid">
     	<jsp:include page="/breadcrumb.jsp"></jsp:include>
-        <div>
-            <h1 class="page-header">车辆管理</h1>
-        </div>
         <div class="panel-heading">
         </div>
         <div class="row">
@@ -19,7 +16,7 @@
                     <!-- /.panel-heading -->
                     <div class="panel-body">
                         <div class="dataTable_wrapper">
-                        	<%-- <form class="searchForm form-horizontal" action="${pageContext.request.contextPath}/car.do/car.view" method="post">
+                        	<form class="searchForm form-horizontal" action="${pageContext.request.contextPath}/car.do/car.view/0" method="post">
                         		<h5>查询条件</h5>
                         		<div class="form-group">
 	                                <label class="col-sm-1 control-label">高</label>
@@ -47,8 +44,11 @@
                                 	<div class="col-sm-1">
                                 		<button type="reset" class="btn btn-primary form-control">重置</button>
                                 	</div>
+                                	<div class="col-sm-1">
+                                		<a href="${pageContext.request.contextPath}/car.do/car_add.view" class="btn btn-primary" role="button">新增</a>
+                                	</div>
                                 </div>
-                        	</form> --%>
+                        	</form>
                             <table class="table table-striped table-bordered table-hover" id="dataTables-example">
                                 <thead>
                                 <tr>
@@ -84,7 +84,8 @@
                                 </c:forEach>
                                 </tbody>
                             </table>
-                            <a href="${pageContext.request.contextPath}/car.do/car_add.view" class="btn btn-primary" role="button">添加车辆</a>
+                            
+                           <jsp:include page="/WEB-INF/view/admin/pageSplit.jsp"></jsp:include>
                         </div>
                         <!-- /.table-responsive -->
                     </div>
diff --git a/src/main/webapp/WEB-INF/view/vm/standard/standard.jsp b/src/main/webapp/WEB-INF/view/vm/standard/standard.jsp
index b2ab6a2..705f18f 100644
--- a/src/main/webapp/WEB-INF/view/vm/standard/standard.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/standard/standard.jsp
@@ -40,6 +40,7 @@
                                 </tbody>
                             </table>
                             <a href="${pageContext.request.contextPath}/standard.do/standard_add.view" class="btn btn-primary" role="button">添加规格</a>
+                            <jsp:include page="/WEB-INF/view/admin/pageSplit.jsp"></jsp:include>
                         </div>
                         <!-- /.table-responsive -->
                     </div>
diff --git a/src/main/webapp/breadcrumb.jsp b/src/main/webapp/breadcrumb.jsp
index 130cfba..18b3d37 100644
--- a/src/main/webapp/breadcrumb.jsp
+++ b/src/main/webapp/breadcrumb.jsp
@@ -3,6 +3,7 @@
 
 <ol class="breadcrumb">
 <c:forEach items="${sessionScope.breadcrumbs}" var="bread" varStatus="s">
+	${bread.view }/${bread.name }
 	<c:if test="${not s.last }">
 		<li><a href="${bread.view }">${bread.name }</a></li>
 	</c:if>
diff --git a/target/classes/db.properties b/target/classes/db.properties
index 8bec0a8..4625c71 100644
--- a/target/classes/db.properties
+++ b/target/classes/db.properties
@@ -1,4 +1,4 @@
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://localhost:3306/vehicle
-jdbc.password=root
+jdbc.url=jdbc:mysql://rm-uf6ggkftngujcn480o.mysql.rds.aliyuncs.com:3306/car_sale_sh
+jdbc.password=root_123
 jdbc.username=root

From 3d193e92132dd15adee6bf6f811fb66f21e5c98c Mon Sep 17 00:00:00 2001
From: Freepolis <jiaye9553@gmail.com>
Date: Mon, 13 Mar 2017 21:30:57 +0800
Subject: [PATCH 04/14] =?UTF-8?q?=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .classpath                                     |  6 +++---
 .project                                       |  2 +-
 .../interceptor/BreadcrumbIntercepter.java     |  4 ++--
 src/main/webapp/WEB-INF/view/admin/bottom.jsp  |  4 ++--
 src/main/webapp/WEB-INF/view/admin/nav.jsp     |  3 ++-
 .../webapp/WEB-INF/view/admin/pageSplit.jsp    | 18 ++++++++++--------
 src/main/webapp/WEB-INF/view/vm/car/car.jsp    | 11 ++++-------
 src/main/webapp/breadcrumb.jsp                 |  1 -
 src/main/webapp/css/Splitbutton.css            | 10 ++++++++++
 src/main/webapp/js/main.js                     |  8 ++++----
 10 files changed, 38 insertions(+), 29 deletions(-)
 create mode 100644 src/main/webapp/css/Splitbutton.css

diff --git a/.classpath b/.classpath
index 8041ee8..4c6d0b4 100644
--- a/.classpath
+++ b/.classpath
@@ -17,15 +17,15 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<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="output" path="target/classes"/>
diff --git a/.project b/.project
index 4d3d0ff..b459db5 100644
--- a/.project
+++ b/.project
@@ -47,8 +47,8 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>com.genuitec.eclipse.springframework.springnature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>com.genuitec.eclipse.springframework.springnature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
diff --git a/src/main/java/com/system/interceptor/BreadcrumbIntercepter.java b/src/main/java/com/system/interceptor/BreadcrumbIntercepter.java
index 89189cd..0c3ba7f 100644
--- a/src/main/java/com/system/interceptor/BreadcrumbIntercepter.java
+++ b/src/main/java/com/system/interceptor/BreadcrumbIntercepter.java
@@ -27,7 +27,7 @@ public class BreadcrumbIntercepter implements HandlerInterceptor {
 	private Logger log = Logger.getLogger(BreadcrumbIntercepter.class);
 	private Properties properties;
 	//private Pattern p1 = Pattern.compile("[//\\a-zA-Z]+?(?<!add|update|delete)\\.view");
-	private Pattern p2 = Pattern.compile(".*?(add|update|delete)\\.view");
+	private Pattern p2 = Pattern.compile(".*?(add|update|delete)\\.view.*");
 	private Pattern pc = Pattern.compile("(?:/.*?/)(.*?)(?:\\.|/)");
 	public BreadcrumbIntercepter() {
 		properties = new Properties();
@@ -65,7 +65,7 @@ public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletRespo
         	return true;
         }
         
-        if(url.matches("[//\\a-zA-Z]+?(?<!add|update|delete)\\.view")) {
+        if(url.matches("[//\\a-zA-Z]+?(?<!add|update|delete)\\.view.*")) {
         	if(breadcrumbs.size()==3)
         		breadcrumbs.remove(2);
         	if(breadcrumbs.size()==2)
diff --git a/src/main/webapp/WEB-INF/view/admin/bottom.jsp b/src/main/webapp/WEB-INF/view/admin/bottom.jsp
index d671593..bc74a8a 100644
--- a/src/main/webapp/WEB-INF/view/admin/bottom.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/bottom.jsp
@@ -11,9 +11,9 @@
 <!-- custom Theme JavaScript -->
 <script src="${pageContext.request.contextPath}/dist/js/sb-admin-2.js"></script>
 
-<!-- DataTables JavaScript -->
+<!-- DataTables JavaScript 
 <script src="${pageContext.request.contextPath}/bower_components/datatables/media/js/jquery.dataTables.min.js"></script>
-<script src="${pageContext.request.contextPath}/bower_components/datatables-plugins/integration/bootstrap/3/dataTables.bootstrap.min.js"></script>
+<script src="${pageContext.request.contextPath}/bower_components/datatables-plugins/integration/bootstrap/3/dataTables.bootstrap.min.js"></script>-->
 <!-- Page-Level Demo Scripts - Tables - Use for reference -->
 
 <!-- select JavaScript -->
diff --git a/src/main/webapp/WEB-INF/view/admin/nav.jsp b/src/main/webapp/WEB-INF/view/admin/nav.jsp
index 09bf513..d014690 100644
--- a/src/main/webapp/WEB-INF/view/admin/nav.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/nav.jsp
@@ -38,7 +38,8 @@
     <link href="${pageContext.request.contextPath}/bower_components/sweetalert/sweetalert.css"
           rel="stylesheet" type="text/css">
           
-          
+   <link href="${pageContext.request.contextPath}/css/Splitbutton.css" rel="stylesheet" type="text/css">       
+    
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you util the page via file:// -->
     <!--[if lt IE 9]>
diff --git a/src/main/webapp/WEB-INF/view/admin/pageSplit.jsp b/src/main/webapp/WEB-INF/view/admin/pageSplit.jsp
index a8d3940..b5c964d 100644
--- a/src/main/webapp/WEB-INF/view/admin/pageSplit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/pageSplit.jsp
@@ -2,23 +2,25 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://shiro.apache.org/tags" prefix="shiro" %>
 <!DOCTYPE html>
+<div style ='text-align: center;margin: auto;margin-top: -33px;'>
   <c:if test="${page.hasPreviousPage  == true}">
-             <a href="0" class="btn btn-primary" role="button">首页</a>
-             <a href="${page.prePage}" class="btn btn-primary" role="button">上一页</a>
+             <a href="0" class="btn btn-primary noselect" role="button">首页</a>
+             <a href="${page.prePage}" class="btn btn-primary noselect" role="button">上一页</a>
         </c:if>
         <c:forEach begin="1" end="${page.pages}" var="each">
             <c:choose>
                  <c:when test="${each == page.pageNum}">
-                     <a href="${each}" class="btn btn-primary" role="button">${each}</a>
+                     <a href="${each}" class="btn btn-primary selected" role="button">${each}</a>
                 </c:when>
                  <c:when test="${each >= (page.pageNum - 2) && each <= (page.pageNum + 2)}">
-                  <a href="${each}" class="btn btn-primary" role="button">${each}</a>
+                  <a href="${each}" class="btn btn-primary noselect" role="button">${each}</a>
                 </c:when>
             </c:choose>
         </c:forEach>
          <c:if test="${page.hasNextPage }">
-             <a href="${page.nextPage}" class="btn btn-primary" role="button">下一页</a>
-	         <a href="${page.pages}" class="btn btn-primary" role="button">尾页</a>
-         </c:if>
-  共${page.pages}页
+             <a href="${page.nextPage}" class="btn btn-primary noselect" role="button">下一页</a>
+	         <a href="${page.pages}" class="btn btn-primary noselect" role="button">尾页</a>
+         </c:if>   
+  <span style=' font-size: 14px; margin-left: 10px;'>共${page.pages}页</span>
+  </div>
  
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/view/vm/car/car.jsp b/src/main/webapp/WEB-INF/view/vm/car/car.jsp
index 6dbbead..ba8c471 100644
--- a/src/main/webapp/WEB-INF/view/vm/car/car.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/car/car.jsp
@@ -44,9 +44,6 @@
                                 	<div class="col-sm-1">
                                 		<button type="reset" class="btn btn-primary form-control">重置</button>
                                 	</div>
-                                	<div class="col-sm-1">
-                                		<a href="${pageContext.request.contextPath}/car.do/car_add.view" class="btn btn-primary" role="button">新增</a>
-                                	</div>
                                 </div>
                         	</form>
                             <table class="table table-striped table-bordered table-hover" id="dataTables-example">
@@ -83,11 +80,11 @@
                                     </tr>
                                 </c:forEach>
                                 </tbody>
-                            </table>                      
+                            </table>               
+                             <a href="${pageContext.request.contextPath}/car.do/car_add.view" class="btn btn-primary" role="button">添加车辆</a>
+                            <button class="btn btn-primary" onclick="uploader.uploadModal('${pageContext.request.contextPath}/car.do/import','${pageContext.request.contextPath}/template/car_tpl.xlsx')">批量上传</button>       
                            <jsp:include page="/WEB-INF/view/admin/pageSplit.jsp"></jsp:include>
-
-                            <a href="${pageContext.request.contextPath}/car.do/car_add.view" class="btn btn-primary" role="button">添加车辆</a>
-                            <button class="btn btn-primary" onclick="uploader.uploadModal('${pageContext.request.contextPath}/car.do/import','${pageContext.request.contextPath}/template/car_tpl.xlsx')">批量上传</button>
+                           
                         </div>
                         <!-- /.table-responsive -->
                     </div>
diff --git a/src/main/webapp/breadcrumb.jsp b/src/main/webapp/breadcrumb.jsp
index 18b3d37..130cfba 100644
--- a/src/main/webapp/breadcrumb.jsp
+++ b/src/main/webapp/breadcrumb.jsp
@@ -3,7 +3,6 @@
 
 <ol class="breadcrumb">
 <c:forEach items="${sessionScope.breadcrumbs}" var="bread" varStatus="s">
-	${bread.view }/${bread.name }
 	<c:if test="${not s.last }">
 		<li><a href="${bread.view }">${bread.name }</a></li>
 	</c:if>
diff --git a/src/main/webapp/css/Splitbutton.css b/src/main/webapp/css/Splitbutton.css
new file mode 100644
index 0000000..ac107a6
--- /dev/null
+++ b/src/main/webapp/css/Splitbutton.css
@@ -0,0 +1,10 @@
+.btn.btn-primary.noselect{
+ 	color: #337ab7;
+    background-color: #fff;
+    border-color: #2e6da4;
+ } 
+.btn.btn-primary.selected {
+ 	color: #fff;
+    background-color: #337ab7;
+    border-color: #2e6da4;
+ }  
diff --git a/src/main/webapp/js/main.js b/src/main/webapp/js/main.js
index 45435f6..bf7d23c 100644
--- a/src/main/webapp/js/main.js
+++ b/src/main/webapp/js/main.js
@@ -1,6 +1,6 @@
 $(document).ready(function () {
 	$('html').niceScroll({cursorcolor:"#ccc", horizrailenabled: false, enablekeyboard: false});
-    dataTable = $('#dataTables-example').DataTable({
+	/* dataTable = $('#dataTables-example').DataTable({
 	  //dom: '<"toolbar">',
       responsive: true,
       language: {
@@ -27,12 +27,12 @@ $(document).ready(function () {
     			"sSortDescending": ": 以降序排列此列"
     		}
     	}
-      /*createdRow: function( row, data, dataIndex ) {
+      createdRow: function( row, data, dataIndex ) {
    	    if ( dataIndex % 2 == 0 ) {
    	      $(row).addClass( 'important' );
    	    }
-   	  } */
-    });
+   	  } 
+    });*/
     
     
     //上传控件

From 78e49bf73c95f8e3efd1b1d352bb711ba8dcdeae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=8D=8E=E6=88=90?= <duhuacheng.ver@gmail.com>
Date: Tue, 14 Mar 2017 16:53:10 +0800
Subject: [PATCH 05/14] =?UTF-8?q?=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .settings/com.genuitec.eclipse.core.prefs     |    3 +
 src/main/java/com/entity/Agent.java           |   84 +
 .../interceptor/BreadcrumbIntercepter.java    |    4 +-
 .../com/vm/controller/AgentController.java    |   90 +
 .../java/com/vm/controller/CarController.java |    5 +-
 .../com/vm/controller/StandardController.java |   16 +-
 src/main/java/com/vm/dao/AgentDao.java        |   18 +
 src/main/java/com/vm/service/AgentBiz.java    |   19 +
 .../com/vm/service/impl/AgentBizImpl.java     |   39 +
 src/main/resources/breadcrumb-e-c.properties  |    1 +
 src/main/resources/mapper/AgentDao.xml        |   63 +
 src/main/resources/mapper/CarDao.xml          |   15 +-
 src/main/webapp/WEB-INF/tld/spring-form.tld   | 2469 +++++++++++++++++
 src/main/webapp/WEB-INF/tld/spring.tld        |  467 ++++
 .../{ => WEB-INF/view/admin}/breadcrumb.jsp   |    1 -
 src/main/webapp/WEB-INF/view/admin/nav.jsp    |    9 +-
 .../webapp/WEB-INF/view/admin/pageSplit.jsp   |   63 +-
 .../view/admin/system/resource/resource.jsp   |    2 +-
 .../admin/system/resource/resource_add.jsp    |    2 +-
 .../WEB-INF/view/admin/system/role/role.jsp   |    2 +-
 .../view/admin/system/role/role_add.jsp       |    2 +-
 .../view/admin/system/role/role_update.jsp    |    2 +-
 .../WEB-INF/view/admin/system/user/user.jsp   |    2 +-
 .../view/admin/system/user/user_add.jsp       |    2 +-
 .../view/admin/system/user/user_update.jsp    |    2 +-
 .../webapp/WEB-INF/view/vm/agent/agent.jsp    |  103 +
 .../WEB-INF/view/vm/agent/agent_add.jsp       |   84 +
 .../WEB-INF/view/vm/agent/agent_update.jsp    |   86 +
 src/main/webapp/WEB-INF/view/vm/car/car.jsp   |   39 +-
 .../webapp/WEB-INF/view/vm/car/car_add.jsp    |    2 +-
 .../webapp/WEB-INF/view/vm/car/car_update.jsp |    2 +-
 .../WEB-INF/view/vm/standard/standard.jsp     |   32 +-
 .../WEB-INF/view/vm/standard/standard_add.jsp |    2 +-
 .../view/vm/standard/standard_update.jsp      |    2 +-
 src/main/webapp/WEB-INF/web.xml               |   17 +-
 src/main/webapp/js/main.js                    |   30 +
 36 files changed, 3720 insertions(+), 61 deletions(-)
 create mode 100644 .settings/com.genuitec.eclipse.core.prefs
 create mode 100644 src/main/java/com/entity/Agent.java
 create mode 100644 src/main/java/com/vm/controller/AgentController.java
 create mode 100644 src/main/java/com/vm/dao/AgentDao.java
 create mode 100644 src/main/java/com/vm/service/AgentBiz.java
 create mode 100644 src/main/java/com/vm/service/impl/AgentBizImpl.java
 create mode 100644 src/main/resources/mapper/AgentDao.xml
 create mode 100644 src/main/webapp/WEB-INF/tld/spring-form.tld
 create mode 100644 src/main/webapp/WEB-INF/tld/spring.tld
 rename src/main/webapp/{ => WEB-INF/view/admin}/breadcrumb.jsp (90%)
 create mode 100644 src/main/webapp/WEB-INF/view/vm/agent/agent.jsp
 create mode 100644 src/main/webapp/WEB-INF/view/vm/agent/agent_add.jsp
 create mode 100644 src/main/webapp/WEB-INF/view/vm/agent/agent_update.jsp

diff --git a/.settings/com.genuitec.eclipse.core.prefs b/.settings/com.genuitec.eclipse.core.prefs
new file mode 100644
index 0000000..cf29e83
--- /dev/null
+++ b/.settings/com.genuitec.eclipse.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+validator.Checked=src/main/webapp/WEB-INF/view/admin/pageSplit.jsp
+validator.Unchecked=
diff --git a/src/main/java/com/entity/Agent.java b/src/main/java/com/entity/Agent.java
new file mode 100644
index 0000000..2838acf
--- /dev/null
+++ b/src/main/java/com/entity/Agent.java
@@ -0,0 +1,84 @@
+package com.entity;
+
+import java.io.Serializable;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+public class Agent implements Serializable{
+	private static final long serialVersionUID = 6534271072663770032L;
+	private Long id;
+	@NotEmpty
+    private Boolean isSale;
+	@NotEmpty
+    private String carId;
+	@NotEmpty
+    private Integer high;
+	@NotEmpty
+    private Integer length;
+	@NotEmpty
+    private Integer wide;
+	@NotEmpty
+    private Integer weight;
+	
+	public Agent() {
+		super();
+	}
+	public Agent(String carId,Boolean isSale, Integer high,
+			Integer length, Integer wide, Integer weight) {
+		super();
+		this.isSale = isSale;
+		this.carId = carId;
+		this.high = high;
+		this.length = length;
+		this.wide = wide;
+		this.weight = weight;
+	}
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public Boolean getIsSale() {
+		return isSale;
+	}
+	public void setIsSale(Boolean isSale) {
+		this.isSale = isSale;
+	}
+	public String getCarId() {
+		return carId;
+	}
+	public void setCarId(String carId) {
+		this.carId = carId;
+	}
+	public Integer getHigh() {
+		return high;
+	}
+	public void setHigh(Integer high) {
+		this.high = high;
+	}
+	public Integer getLength() {
+		return length;
+	}
+	public void setLength(Integer length) {
+		this.length = length;
+	}
+	public Integer getWide() {
+		return wide;
+	}
+	public void setWide(Integer wide) {
+		this.wide = wide;
+	}
+	public Integer getWeight() {
+		return weight;
+	}
+	public void setWeight(Integer weight) {
+		this.weight = weight;
+	}
+	@Override
+	public String toString() {
+		return "Car [id=" + id + ", isSale=" + isSale + ", carId=" + carId
+				+ ", high=" + high + ", length=" + length + ", wide=" + wide
+				+ ", weight=" + weight + "]";
+	}
+}
diff --git a/src/main/java/com/system/interceptor/BreadcrumbIntercepter.java b/src/main/java/com/system/interceptor/BreadcrumbIntercepter.java
index 89189cd..0c3ba7f 100644
--- a/src/main/java/com/system/interceptor/BreadcrumbIntercepter.java
+++ b/src/main/java/com/system/interceptor/BreadcrumbIntercepter.java
@@ -27,7 +27,7 @@ public class BreadcrumbIntercepter implements HandlerInterceptor {
 	private Logger log = Logger.getLogger(BreadcrumbIntercepter.class);
 	private Properties properties;
 	//private Pattern p1 = Pattern.compile("[//\\a-zA-Z]+?(?<!add|update|delete)\\.view");
-	private Pattern p2 = Pattern.compile(".*?(add|update|delete)\\.view");
+	private Pattern p2 = Pattern.compile(".*?(add|update|delete)\\.view.*");
 	private Pattern pc = Pattern.compile("(?:/.*?/)(.*?)(?:\\.|/)");
 	public BreadcrumbIntercepter() {
 		properties = new Properties();
@@ -65,7 +65,7 @@ public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletRespo
         	return true;
         }
         
-        if(url.matches("[//\\a-zA-Z]+?(?<!add|update|delete)\\.view")) {
+        if(url.matches("[//\\a-zA-Z]+?(?<!add|update|delete)\\.view.*")) {
         	if(breadcrumbs.size()==3)
         		breadcrumbs.remove(2);
         	if(breadcrumbs.size()==2)
diff --git a/src/main/java/com/vm/controller/AgentController.java b/src/main/java/com/vm/controller/AgentController.java
new file mode 100644
index 0000000..e48d108
--- /dev/null
+++ b/src/main/java/com/vm/controller/AgentController.java
@@ -0,0 +1,90 @@
+package com.vm.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.entity.Agent;
+import com.entity.Standard;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.util.ResultMapUtil;
+import com.vm.service.AgentBiz;
+import com.vm.service.StandardBiz;
+
+@Controller
+@RequestMapping("agent.do")
+public class AgentController {
+	private Logger log = Logger.getLogger(AgentController.class);
+
+    @Autowired
+    private AgentBiz agentBiz;
+    @Autowired
+    private StandardBiz standardBiz;
+
+    @RequiresPermissions("agent:query")
+    @RequestMapping("agent.view/{pageNum}/{pageSize}")
+    public String agentView(Agent agent,Model m,@PathVariable("pageNum") int pageNum,
+    		@PathVariable("pageNum") int pageSize) {
+    	PageHelper.startPage(pageNum, pageSize);
+    	List<Agent> list =  agentBiz.find(agent);
+    	PageInfo<Agent> page = new PageInfo<Agent>(list);
+        m.addAttribute("agentList", list);
+        m.addAttribute("page", page);
+        return "/vm/agent/agent";
+    }
+
+    @RequiresPermissions("agent:add")
+    @RequestMapping("agent_add.view")
+    public String agentAddView(Model m) {
+    	m.addAttribute("standardList", standardBiz.find(new Standard()));
+        return "/vm/agent/agent_add";
+    }
+
+    @RequiresPermissions("agent:update")
+    @RequestMapping("agent_update.view")
+    public String agentUpdateView(Long id,Model m) {
+    	m.addAttribute("standardList", standardBiz.find(new Standard()));
+    	m.addAttribute("agent",agentBiz.findById(id));
+        return "/vm/agent/agent_update";
+    }
+
+    @RequiresPermissions("agent:add")
+    @RequestMapping("add")
+    public String add(Agent agent) {
+        agentBiz.add(agent);
+        return "redirect:/agent.do/agent.view";
+    }
+
+    @RequiresPermissions("agent:update")
+    @RequestMapping("update")
+    public String update(Agent agent) {
+        agentBiz.update(agent);
+        return "redirect:/agent.do/agent.view";
+    }
+
+    @RequiresPermissions("agent:delete")
+    @RequestMapping("delete")
+    public String delete(Long id) {
+        agentBiz.delete(id);
+        return "redirect:/agent.do/agent.view";
+    }
+    
+    @RequiresPermissions("agent:delete")
+    @RequestMapping("test")
+    @ResponseBody
+    public Map<String,Object> test(@RequestBody String json) {
+        log.info(json.toString());
+        return ResultMapUtil.getSuccessMap("123");
+    }
+}
diff --git a/src/main/java/com/vm/controller/CarController.java b/src/main/java/com/vm/controller/CarController.java
index c91281b..35525cd 100644
--- a/src/main/java/com/vm/controller/CarController.java
+++ b/src/main/java/com/vm/controller/CarController.java
@@ -41,10 +41,9 @@ public class CarController {
     private StandardBiz standardBiz;
 
     @RequiresPermissions("car:query")
-    @RequestMapping("car.view/{pageNum}")
+    @RequestMapping("car.view/{pageNum}/{pageSize}")
     public String CarView(Car car,Model m,@PathVariable("pageNum") int pageNum,
-            @RequestParam(required=false,defaultValue="3") Integer pageSize) {
-    	
+    		@PathVariable("pageSize") int pageSize) {
     	PageHelper.startPage(pageNum, pageSize);
     	List<Car> list =  carBiz.find(car);
     	PageInfo<Car> page = new PageInfo<Car>(list);
diff --git a/src/main/java/com/vm/controller/StandardController.java b/src/main/java/com/vm/controller/StandardController.java
index 206d764..9d3d477 100644
--- a/src/main/java/com/vm/controller/StandardController.java
+++ b/src/main/java/com/vm/controller/StandardController.java
@@ -1,12 +1,17 @@
 package com.vm.controller;
 
+import java.util.List;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import com.entity.Standard;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.vm.service.StandardBiz;
 
 @Controller
@@ -17,9 +22,14 @@ public class StandardController {
     private StandardBiz standardBiz;
 
     @RequiresPermissions("standard:query")
-    @RequestMapping("standard.view")
-    public String standardView(Standard standard,Model m) {
-        m.addAttribute("standardList", standardBiz.find(standard));
+    @RequestMapping("standard.view/{pageNum}/{pageSize}")
+    public String standardView(Standard standard,Model m,@PathVariable("pageNum") int pageNum,
+    		@PathVariable("pageSize") int pageSize) {
+    	PageHelper.startPage(pageNum, pageSize);
+    	List<Standard> list =  standardBiz.find(standard);
+    	PageInfo<Standard> page = new PageInfo<Standard>(list);
+        m.addAttribute("standardList", list);
+        m.addAttribute("page", page);
         return "/vm/standard/standard";
     }
 
diff --git a/src/main/java/com/vm/dao/AgentDao.java b/src/main/java/com/vm/dao/AgentDao.java
new file mode 100644
index 0000000..07b8db7
--- /dev/null
+++ b/src/main/java/com/vm/dao/AgentDao.java
@@ -0,0 +1,18 @@
+package com.vm.dao;
+
+import java.util.List;
+
+import com.entity.Agent;
+
+public interface AgentDao {
+    public List<Agent> find(Agent agent);
+    
+    public Agent findById(Long id);
+
+    public void add(Agent Agent);
+
+    public void update(Agent agent);
+
+    public void delete(Long id);
+
+}
diff --git a/src/main/java/com/vm/service/AgentBiz.java b/src/main/java/com/vm/service/AgentBiz.java
new file mode 100644
index 0000000..4559df1
--- /dev/null
+++ b/src/main/java/com/vm/service/AgentBiz.java
@@ -0,0 +1,19 @@
+package com.vm.service;
+
+import java.util.List;
+
+import com.entity.Agent;
+
+public interface AgentBiz {
+	public List<Agent> find(Agent agent);
+
+    public void add(Agent agent);
+
+    public void update(Agent agent);
+
+    public void delete(Long id);
+
+	public Agent findById(Long id);
+
+
+}
diff --git a/src/main/java/com/vm/service/impl/AgentBizImpl.java b/src/main/java/com/vm/service/impl/AgentBizImpl.java
new file mode 100644
index 0000000..a81ac23
--- /dev/null
+++ b/src/main/java/com/vm/service/impl/AgentBizImpl.java
@@ -0,0 +1,39 @@
+package com.vm.service.impl;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.entity.Agent;
+import com.vm.dao.AgentDao;
+import com.vm.service.AgentBiz;
+
+@Service
+public class AgentBizImpl implements AgentBiz {
+    @Resource
+    private AgentDao AgentDao;
+
+    public List<Agent> find(Agent agent) {
+        return AgentDao.find(agent);
+    }
+
+    @Override
+	public Agent findById(Long id) {
+		return AgentDao.findById(id);
+	}
+
+	public void add(Agent agent) {
+        AgentDao.add(agent);
+    }
+
+    public void update(Agent agent) {
+        AgentDao.update(agent);
+    }
+
+    public void delete(Long AgentId) {
+        AgentDao.delete(AgentId);
+    }
+
+}
diff --git a/src/main/resources/breadcrumb-e-c.properties b/src/main/resources/breadcrumb-e-c.properties
index 4c325c2..15ff0ba 100644
--- a/src/main/resources/breadcrumb-e-c.properties
+++ b/src/main/resources/breadcrumb-e-c.properties
@@ -7,3 +7,4 @@ role=\u89D2\u8272
 resource=\u8D44\u6E90
 user=\u7528\u6237
 standard=\u89C4\u683C
+agent=\u4EE3\u7406\u5546
diff --git a/src/main/resources/mapper/AgentDao.xml b/src/main/resources/mapper/AgentDao.xml
new file mode 100644
index 0000000..a1a9bdb
--- /dev/null
+++ b/src/main/resources/mapper/AgentDao.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+
+<mapper namespace="com.vm.dao.AgentDao">
+
+    <resultMap id="agent_map" type="Agent">
+        <id property="id" column="id"/>
+        <result property="level" column="level"/>
+        <result property="agentName" column="agent_name"/>
+        <result property="clerkId" column="clerk_id"/>
+        <result property="area" column="area"/>
+    </resultMap>
+
+
+    <select id="find" resultMap="agent_map" parameterType="Agent">
+        SELECT * FROM agent
+        <where>
+        	<if test="level!=null and level!=''">
+        		and level=#{level}
+        	</if>
+        	<if test="agentName!=null and agentName!=''">
+        		and agent_name=#{agentName}
+        	</if>
+        	<if test="area!=null and area!=''">
+        		and area=#{area}
+        	</if>
+        </where>
+    </select>
+
+    <select id="findById" parameterType="long" resultMap="agent_map">
+        SELECT * FROM agent WHERE id = #{value}
+    </select>
+
+    <update id="update" parameterType="Agent">
+        UPDATE agent 
+        <set>
+        	<if test="level!=null and level!=''">
+        		level=#{level},
+        	</if>
+        	<if test="agentName!=null and agentName!=''">
+        		agent_name=#{agentName},
+        	</if>
+        	<if test="area != null and area!=''">
+        		area=#{area},
+        	</if>
+        	<if test="clerkId != null">
+        		clerk_id=#{clerkId},
+        	</if>
+        </set>
+        WHERE id = #{id}
+    </update>
+
+    <insert id="add" parameterType="Agent">
+        INSERT INTO agent(level,agent_name,clerk_id,area) VALUES(#{level},#{agentName},#{clerkId},#{area})
+    </insert>
+
+    <delete id="delete" parameterType="long">
+        DELETE FROM agent WHERE id = #{id}
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/CarDao.xml b/src/main/resources/mapper/CarDao.xml
index 30dc268..ac02c15 100644
--- a/src/main/resources/mapper/CarDao.xml
+++ b/src/main/resources/mapper/CarDao.xml
@@ -21,12 +21,25 @@
         SELECT * FROM car
         <where>
         	<if test="isSale!=null">
-        		is_sale=#{isSale}
+        		is_sale=#{isSale,jdbcType=BOOLEAN}
         	</if>
         	<if test="carId!=null and carId!=''">
         		car_id=#{carId}
         	</if>
+        	<if test="high!=null">
+        		high=#{high}
+        	</if>
+        	<if test="length!=null">
+        		length=#{length}
+        	</if>
+        	<if test="wide!=null">
+        		wide=#{wide}
+        	</if>
+        	<if test="weight!=null">
+        		weight=#{weight}
+        	</if>
         </where>
+        order by is_sale,car_id
     </select>
 
     <select id="findById" parameterType="long" resultMap="car_map">
diff --git a/src/main/webapp/WEB-INF/tld/spring-form.tld b/src/main/webapp/WEB-INF/tld/spring-form.tld
new file mode 100644
index 0000000..a6c39cc
--- /dev/null
+++ b/src/main/webapp/WEB-INF/tld/spring-form.tld
@@ -0,0 +1,2469 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+		version="2.0">
+
+	<description>Spring Framework JSP Form Tag Library</description>
+	<tlib-version>4.3</tlib-version>
+	<short-name>form</short-name>
+	<uri>http://www.springframework.org/tags/form</uri>
+
+	<tag>
+		<description>Renders an HTML 'form' tag and exposes a binding path to inner tags
+		for binding.</description>
+		<name>form</name>
+		<tag-class>org.springframework.web.servlet.tags.form.FormTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute - added for backwards compatibility cases</description>
+			<name>name</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Enable/disable HTML escaping of rendered values.</description>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "style" - HTML Optional Attribute</description>
+			<name>cssStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>lang</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>title</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>dir</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>ondblclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousedown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseover</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousemove</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseout</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeypress</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeyup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeydown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Name of the model attribute under which the form object is exposed.
+			Defaults to 'command'.</description>
+			<name>modelAttribute</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>DEPRECATED: Use "modelAttribute" instead.</description>
+			<name>commandName</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Required Attribute</description>
+			<name>action</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Action reference to be appended to the current servlet path</description>
+			<name>servletRelativeAction</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute</description>
+			<name>method</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute</description>
+			<name>target</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute</description>
+			<name>enctype</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Specifies the list of character encodings for input data that is accepted
+			by the server processing this form. The value is a space- and/or comma-delimited list of
+			charset values. The client must interpret this list as an exclusive-or list, i.e. the
+			server is able to accept any single character encoding per entity received.</description>
+			<name>acceptCharset</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onsubmit</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onreset</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Common Optional Attribute</description>
+			<name>autocomplete</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The parameter name used for HTTP methods other then GET and POST.
+			Default is '_method'.</description>
+			<name>methodParam</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+
+	<tag>
+		<description>Renders an HTML 'input' tag with type 'text' using the bound value.</description>
+		<name>input</name>
+		<tag-class>org.springframework.web.servlet.tags.form.InputTag</tag-class>
+		<body-content>empty</body-content>
+		<attribute>
+			<description>Path to property for data binding</description>
+			<name>path</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Enable/disable HTML escaping of rendered values.</description>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute.
+			Used when the bound field has errors.</description>
+			<name>cssErrorClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "style" - HTML Optional Attribute</description>
+			<name>cssStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>lang</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>title</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>dir</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>tabindex</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute. Setting the value of this attribute to 'true'
+			will disable the HTML element.</description>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>ondblclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousedown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseover</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousemove</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseout</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeypress</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeyup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeydown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onfocus</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onblur</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onchange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>accesskey</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute</description>
+			<name>size</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute</description>
+			<name>maxlength</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute</description>
+			<name>alt</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onselect</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute. Setting the value of this attribute to 'true'
+			will make the HTML element readonly.</description>
+			<name>readonly</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Common Optional Attribute</description>
+			<name>autocomplete</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+
+	<tag>
+		<description>Renders an HTML 'input' tag with type 'password' using the bound value.</description>
+		<name>password</name>
+		<tag-class>org.springframework.web.servlet.tags.form.PasswordInputTag</tag-class>
+		<body-content>empty</body-content>
+		<attribute>
+			<description>Path to property for data binding</description>
+			<name>path</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Enable/disable HTML escaping of rendered values.</description>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute.
+			Used when the bound field has errors.</description>
+			<name>cssErrorClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "style" - HTML Optional Attribute</description>
+			<name>cssStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>lang</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>title</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>dir</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>tabindex</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute. Setting the value of this attribute to 'true'
+			will disable the HTML element.</description>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>ondblclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousedown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseover</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousemove</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseout</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeypress</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeyup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeydown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onfocus</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onblur</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onchange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>accesskey</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute</description>
+			<name>size</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute</description>
+			<name>maxlength</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute</description>
+			<name>alt</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onselect</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute. Setting the value of this attribute to 'true'
+			will make the HTML element readonly.</description>
+			<name>readonly</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Common Optional Attribute</description>
+			<name>autocomplete</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Is the password value to be shown? Defaults to false.</description>
+			<name>showPassword</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+
+	<tag>
+		<description>Renders an HTML 'input' tag with type 'hidden' using the bound value.</description>
+		<name>hidden</name>
+		<tag-class>org.springframework.web.servlet.tags.form.HiddenInputTag</tag-class>
+		<body-content>empty</body-content>
+		<attribute>
+			<description>Path to property for data binding</description>
+			<name>path</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Enable/disable HTML escaping of rendered values.</description>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute.
+			Used when the bound field has errors.</description>
+			<name>cssErrorClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "style" - HTML Optional Attribute</description>
+			<name>cssStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>lang</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>title</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>dir</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>tabindex</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute. Setting the value of this attribute to 'true'
+			will disable the HTML element.</description>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>ondblclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousedown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseover</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousemove</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseout</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeypress</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeyup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeydown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+
+	<tag>
+		<description>Renders an HTML 'select' element. Supports data binding to the
+		selected option.</description>
+		<name>select</name>
+		<tag-class>org.springframework.web.servlet.tags.form.SelectTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>Path to property for data binding</description>
+			<name>path</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Enable/disable HTML escaping of rendered values.</description>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute.
+			Used when the bound field has errors.</description>
+			<name>cssErrorClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "style" - HTML Optional Attribute</description>
+			<name>cssStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>lang</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>title</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>dir</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>tabindex</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute. Setting the value of this attribute to 'true'
+			will disable the HTML element.</description>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>ondblclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousedown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseover</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousemove</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseout</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeypress</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeyup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeydown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onfocus</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onblur</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onchange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>accesskey</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The Collection, Map or array of objects used to generate the
+			inner 'option' tags</description>
+			<name>items</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Name of the property mapped to 'value' attribute of the
+			'option' tag</description>
+			<name>itemValue</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Name of the property mapped to the inner text of the
+			'option' tag</description>
+			<name>itemLabel</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute</description>
+			<name>size</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute</description>
+			<name>multiple</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+
+	<tag>
+		<description>Renders a single HTML 'option'.
+		Sets 'selected' as appropriate based on bound value.</description>
+		<name>option</name>
+		<tag-class>org.springframework.web.servlet.tags.form.OptionTag</tag-class>
+		<body-content>JSP</body-content>
+		<variable>
+			<description>The actual value bound to the 'value' attribute</description>
+			<name-given>value</name-given>
+			<variable-class>java.lang.Object</variable-class>
+		</variable>
+		<variable>
+			<description>The String representation of thr value bound to the 'value'
+			attribute, taking into consideration any PropertyEditor associated with
+			the enclosing 'select' tag.</description>
+			<name-given>displayValue</name-given>
+			<variable-class>java.lang.String</variable-class>
+		</variable>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute</description>
+			<name>value</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute</description>
+			<name>label</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Enable/disable HTML escaping of rendered values.</description>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute.
+			Used when the bound field has errors.</description>
+			<name>cssErrorClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "style" - HTML Optional Attribute</description>
+			<name>cssStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>lang</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>title</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>dir</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>tabindex</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute. Setting the value of this attribute to 'true'
+			will disable the HTML element.</description>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>ondblclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousedown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseover</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousemove</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseout</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeypress</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeyup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeydown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+
+	<tag>
+		<description>Renders a list of HTML 'option' tags. Sets 'selected' as appropriate
+		based on bound value.</description>
+		<name>options</name>
+		<tag-class>org.springframework.web.servlet.tags.form.OptionsTag</tag-class>
+		<body-content>empty</body-content>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The Collection, Map or array of objects used to generate the inner
+			'option' tags. This attribute is required unless the containing select's property
+			for data binding is an Enum, in which case the enum's values are used.</description>
+			<name>items</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Name of the property mapped to 'value' attribute of the 'option' tag</description>
+			<name>itemValue</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Name of the property mapped to the inner text of the 'option' tag</description>
+			<name>itemLabel</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Enable/disable HTML escaping of rendered values.</description>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute.
+			Used when the bound field has errors.</description>
+			<name>cssErrorClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "style" - HTML Optional Attribute</description>
+			<name>cssStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>lang</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>title</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>dir</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>tabindex</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute. Setting the value of this attribute to 'true'
+			will disable the HTML element.</description>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>ondblclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousedown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseover</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousemove</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseout</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeypress</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeyup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeydown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+
+	<tag>
+		<description>Renders an HTML 'input' tag with type 'radio'.</description>
+		<name>radiobutton</name>
+		<tag-class>org.springframework.web.servlet.tags.form.RadioButtonTag</tag-class>
+		<body-content>empty</body-content>
+		<attribute>
+			<description>Path to property for data binding</description>
+			<name>path</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Enable/disable HTML escaping of rendered values.</description>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute.
+			Used when the bound field has errors.</description>
+			<name>cssErrorClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "style" - HTML Optional Attribute</description>
+			<name>cssStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>lang</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>title</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>dir</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>tabindex</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute. Setting the value of this attribute to 'true'
+			will disable the HTML element.</description>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>ondblclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousedown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseover</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousemove</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseout</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeypress</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeyup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeydown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onfocus</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onblur</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onchange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>accesskey</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute</description>
+			<name>value</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Value to be displayed as part of the tag</description>
+			<name>label</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+
+	<tag>
+		<description>Renders multiple HTML 'input' tags with type 'radio'.</description>
+		<name>radiobuttons</name>
+		<tag-class>org.springframework.web.servlet.tags.form.RadioButtonsTag</tag-class>
+		<body-content>empty</body-content>
+		<attribute>
+			<description>Path to property for data binding</description>
+			<name>path</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Enable/disable HTML escaping of rendered values.</description>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute.
+			Used when the bound field has errors.</description>
+			<name>cssErrorClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "style" - HTML Optional Attribute</description>
+			<name>cssStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>lang</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>title</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>dir</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>tabindex</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute. Setting the value of this attribute to 'true'
+			will disable the HTML element.</description>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>ondblclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousedown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseover</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousemove</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseout</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeypress</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeyup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeydown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onfocus</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onblur</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onchange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>accesskey</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The Collection, Map or array of objects used to generate the 'input'
+			tags with type 'radio'. This attribute is required unless the property for data
+			binding is an Enum, in which case the enum's values are used.</description>
+			<name>items</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Name of the property mapped to 'value' attribute of the 'input'
+			tags with type 'radio'</description>
+			<name>itemValue</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Value to be displayed as part of the 'input' tags with type
+			'radio'</description>
+			<name>itemLabel</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Delimiter to use between each 'input' tag with type 'radio'.
+			There is no delimiter by default.</description>
+			<name>delimiter</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Specifies the HTML element that is used to enclose each 'input'
+			tag with type 'radio'. Defaults to 'span'.</description>
+			<name>element</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+
+	<tag>
+		<description>Renders an HTML 'input' tag with type 'checkbox'.</description>
+		<name>checkbox</name>
+		<tag-class>org.springframework.web.servlet.tags.form.CheckboxTag</tag-class>
+		<body-content>empty</body-content>
+		<attribute>
+			<description>Path to property for data binding</description>
+			<name>path</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Enable/disable HTML escaping of rendered values.</description>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute.
+			Used when the bound field has errors.</description>
+			<name>cssErrorClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "style" - HTML Optional Attribute</description>
+			<name>cssStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>lang</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>title</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>dir</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>tabindex</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute. Setting the value of this attribute to 'true'
+			will disable the HTML element.</description>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>ondblclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousedown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseover</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousemove</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseout</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeypress</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeyup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeydown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onfocus</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onblur</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onchange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>accesskey</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute</description>
+			<name>value</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Value to be displayed as part of the tag</description>
+			<name>label</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+
+	<tag>
+		<description>Renders multiple HTML 'input' tags with type 'checkbox'.</description>
+		<name>checkboxes</name>
+		<tag-class>org.springframework.web.servlet.tags.form.CheckboxesTag</tag-class>
+		<body-content>empty</body-content>
+		<attribute>
+			<description>Path to property for data binding</description>
+			<name>path</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Enable/disable HTML escaping of rendered values.</description>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute.
+			Used when the bound field has errors.</description>
+			<name>cssErrorClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "style" - HTML Optional Attribute</description>
+			<name>cssStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>lang</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>title</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>dir</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>tabindex</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute. Setting the value of this attribute to 'true'
+			will disable the HTML element.</description>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>ondblclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousedown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseover</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousemove</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseout</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeypress</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeyup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeydown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onfocus</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onblur</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onchange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>accesskey</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The Collection, Map or array of objects used to generate the
+			'input' tags with type 'checkbox'</description>
+			<name>items</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Name of the property mapped to 'value' attribute of the 'input'
+			tags with type 'checkbox'</description>
+			<name>itemValue</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Value to be displayed as part of the 'input' tags with type
+			'checkbox'</description>
+			<name>itemLabel</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Delimiter to use between each 'input' tag with type 'checkbox'.
+			There is no delimiter by default.</description>
+			<name>delimiter</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Specifies the HTML element that is used to enclose each 'input'
+			tag with type 'checkbox'. Defaults to 'span'.</description>
+			<name>element</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+
+	<tag>
+		<description>Renders an HTML 'textarea'.</description>
+		<name>textarea</name>
+		<tag-class>org.springframework.web.servlet.tags.form.TextareaTag</tag-class>
+		<body-content>empty</body-content>
+		<attribute>
+			<description>Path to property for data binding</description>
+			<name>path</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Enable/disable HTML escaping of rendered values.</description>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute.
+			Used when the bound field has errors.</description>
+			<name>cssErrorClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "style" - HTML Optional Attribute</description>
+			<name>cssStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>lang</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>title</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>dir</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>tabindex</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute. Setting the value of this attribute to 'true'
+			will disable the HTML element.</description>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>ondblclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousedown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseover</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousemove</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseout</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeypress</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeyup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeydown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onfocus</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onblur</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onchange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>accesskey</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Required Attribute</description>
+			<name>rows</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Required Attribute</description>
+			<name>cols</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onselect</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute. Setting the value of this attribute to 'true'
+			will make the HTML element readonly.</description>
+			<name>readonly</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+
+	<tag>
+		<description>Renders field errors in an HTML 'span' tag.</description>
+		<name>errors</name>
+		<tag-class>org.springframework.web.servlet.tags.form.ErrorsTag</tag-class>
+		<body-content>JSP</body-content>
+		<variable>
+			<name-given>messages</name-given>
+			<variable-class>java.util.List</variable-class>
+		</variable>
+		<attribute>
+			<description>Path to errors object for data binding</description>
+			<name>path</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Enable/disable HTML escaping of rendered values.</description>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Delimiter for displaying multiple error messages.
+			Defaults to the HTML br tag.</description>
+			<name>delimiter</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "style" - HTML Optional Attribute</description>
+			<name>cssStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>lang</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>title</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>dir</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>tabindex</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>ondblclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousedown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseover</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousemove</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseout</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeypress</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeyup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeydown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Specifies the HTML element that is used to render the enclosing errors.</description>
+			<name>element</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+
+	<tag>
+		<description>Renders a form field label in an HTML 'label' tag.</description>
+		<name>label</name>
+		<tag-class>org.springframework.web.servlet.tags.form.LabelTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>Path to property for data binding</description>
+			<name>path</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Enable/disable HTML escaping of rendered values.</description>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>for</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute.</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "class" - HTML Optional Attribute.
+			Used only when errors are present.</description>
+			<name>cssErrorClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Equivalent to "style" - HTML Optional Attribute</description>
+			<name>cssStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>lang</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>title</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>dir</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Standard Attribute</description>
+			<name>tabindex</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>ondblclick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousedown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseover</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmousemove</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onmouseout</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeypress</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeyup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Event Attribute</description>
+			<name>onkeydown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+
+	<tag>
+		<description>Renders an HTML 'button' tag.</description>
+		<name>button</name>
+		<tag-class>org.springframework.web.servlet.tags.form.ButtonTag</tag-class>
+		<body-content>JSP</body-content>
+        <attribute>
+            <description>HTML Standard Attribute</description>
+            <name>id</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <description>The name attribute for the HTML button tag</description>
+            <name>name</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+		<attribute>
+			<description>The value attribute for the HTML button tag</description>
+			<name>value</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML Optional Attribute. Setting the value of this attribute to 'true'
+			will disable the HTML element.</description>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+	
+</taglib>
diff --git a/src/main/webapp/WEB-INF/tld/spring.tld b/src/main/webapp/WEB-INF/tld/spring.tld
new file mode 100644
index 0000000..8c6a8ca
--- /dev/null
+++ b/src/main/webapp/WEB-INF/tld/spring.tld
@@ -0,0 +1,467 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+		version="2.0">
+
+	<description>Spring Framework JSP Tag Library</description>
+	<tlib-version>4.0</tlib-version>
+	<short-name>spring</short-name>
+	<uri>http://www.springframework.org/tags</uri>
+
+	<tag>
+		<description>Sets default HTML escape value for the current page.
+		Overrides a "defaultHtmlEscape" context-param in web.xml, if any.</description>
+		<name>htmlEscape</name>
+		<tag-class>org.springframework.web.servlet.tags.HtmlEscapeTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>Set the default value for HTML escaping, to be put
+			into the current PageContext.</description>
+			<name>defaultHtmlEscape</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+
+	<tag>
+		<description>Escapes its enclosed body content, applying HTML escaping and/or JavaScript
+		escaping. The HTML escaping flag participates in a page-wide or application-wide setting
+		(i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).</description>
+		<name>escapeBody</name>
+		<tag-class>org.springframework.web.servlet.tags.EscapeBodyTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>Set HTML escaping for this tag, as boolean value. Overrides the
+			default HTML escaping setting for the current page.</description>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Set JavaScript escaping for this tag, as boolean value.
+			Default is 'false'.</description>
+			<name>javaScriptEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+
+	<tag>
+		<description>Retrieves the message with the given code, or text if code isn't resolvable.
+		The HTML escaping flag participates in a page-wide or application-wide setting
+		(i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).</description>
+		<name>message</name>
+		<tag-class>org.springframework.web.servlet.tags.MessageTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>A MessageSourceResolvable argument (direct or through JSP EL).
+			Fits nicely when used in conjunction with Spring's own validation error classes
+			which all implement the MessageSourceResolvable interface. For example, this
+			allows you to iterate over all of the errors in a form, passing each error
+			(using a runtime expression) as the value of this 'message' attribute, thus
+			effecting the easy display of such error messages.</description>
+			<name>message</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The code (key) to use when looking up the message.
+			If code is not provided, the text attribute will be used.</description>
+			<name>code</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Set optional message arguments for this tag, as a (comma-)
+			delimited String (each String argument can contain JSP EL), an Object array
+			(used as argument array), or a single Object (used as single argument).
+			You can additionally use nested spring:argument tags.</description>
+			<name>arguments</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The separator character to be used for splitting the
+			arguments string value; defaults to a 'comma' (',').</description>
+			<name>argumentSeparator</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Default text to output when a message for the given code
+			could not be found. If both text and code are not set, the tag will
+			output null.</description>
+			<name>text</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The string to use when binding the result to the page,
+			request, session or application scope. If not specified, the result
+			gets outputted to the writer (i.e. typically directly to the JSP).</description>
+			<name>var</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The scope to use when exporting the result to a variable.
+			This attribute is only used when var is also set. Possible values are
+			page, request, session and application.</description>
+			<name>scope</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Set HTML escaping for this tag, as boolean value.
+			Overrides the default HTML escaping setting for the current page.</description>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Set JavaScript escaping for this tag, as boolean value.
+			Default is 'false'.</description>
+			<name>javaScriptEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+
+	<tag>
+		<description>Retrieves the theme message with the given code, or text if code isn't
+		resolvable. The HTML escaping flag participates in a page-wide or application-wide setting
+		(i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).</description>
+		<name>theme</name>
+		<tag-class>org.springframework.web.servlet.tags.ThemeTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>A MessageSourceResolvable argument (direct or through JSP EL).</description>
+			<name>message</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The code (key) to use when looking up the message.
+			If code is not provided, the text attribute will be used.</description>
+			<name>code</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Set optional message arguments for this tag, as a (comma-)
+			delimited String (each String argument can contain JSP EL), an Object array
+			(used as argument array), or a single Object (used as single argument).
+			You can additionally use nested spring:argument tags.</description>
+			<name>arguments</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The separator character to be used for splitting the
+			arguments string value; defaults to a 'comma' (',').</description>
+			<name>argumentSeparator</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Default text to output when a message for the given code
+			could not be found. If both text and code are not set, the tag will
+			output null.</description>
+			<name>text</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The string to use when binding the result to the page,
+			request, session or application scope. If not specified, the result
+			gets outputted to the writer (i.e. typically directly to the JSP).</description>
+			<name>var</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The scope to use when exporting the result to a variable.
+			This attribute is only used when var is also set. Possible values are
+			page, request, session and application.</description>
+			<name>scope</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Set HTML escaping for this tag, as boolean value.
+			Overrides the default HTML escaping setting for the current page.</description>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Set JavaScript escaping for this tag, as boolean value.
+			Default is 'false'.</description>
+			<name>javaScriptEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+
+	<tag>
+		<description>Argument tag based on the JSTL fmt:param tag. The purpose is to
+		support arguments inside the spring:message and spring:theme tags.</description>
+		<name>argument</name>
+		<tag-class>org.springframework.web.servlet.tags.ArgumentTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>The value of the argument.</description>
+			<name>value</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+	</tag>
+
+	<tag>
+		<description>Provides Errors instance in case of bind errors. The HTML escaping
+		flag participates in a page-wide or application-wide setting (i.e. by HtmlEscapeTag
+		or a "defaultHtmlEscape" context-param in web.xml).</description>
+		<name>hasBindErrors</name>
+		<tag-class>org.springframework.web.servlet.tags.BindErrorsTag</tag-class>
+		<body-content>JSP</body-content>
+		<variable>
+			<name-given>errors</name-given>
+			<variable-class>org.springframework.validation.Errors</variable-class>
+		</variable>
+		<attribute>
+			<description>The name of the bean in the request, that needs to be
+			inspected for errors. If errors are available for this bean, they
+			will be bound under the 'errors' key.</description>
+			<name>name</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Set HTML escaping for this tag, as boolean value.
+			Overrides the default HTML escaping setting for the current page.</description>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+
+	<tag>
+		<description>Sets a nested path to be used by the bind tag's path.</description>
+		<name>nestedPath</name>
+		<tag-class>org.springframework.web.servlet.tags.NestedPathTag</tag-class>
+		<body-content>JSP</body-content>
+		<variable>
+			<name-given>nestedPath</name-given>
+			<variable-class>java.lang.String</variable-class>
+		</variable>
+		<attribute>
+			<description>Set the path that this tag should apply. E.g. 'customer'
+			to allow bind paths like 'address.street' rather than
+			'customer.address.street'.</description>
+			<name>path</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+
+	<tag>
+		<description>Provides BindStatus object for the given bind path. The HTML escaping
+		flag participates in a page-wide or application-wide setting (i.e. by HtmlEscapeTag
+		or a "defaultHtmlEscape" context-param in web.xml).</description>
+		<name>bind</name>
+		<tag-class>org.springframework.web.servlet.tags.BindTag</tag-class>
+		<body-content>JSP</body-content>
+		<variable>
+			<name-given>status</name-given>
+			<variable-class>org.springframework.web.servlet.support.BindStatus</variable-class>
+		</variable>
+		<attribute>
+			<description>The path to the bean or bean property to bind status
+			information for. For instance account.name, company.address.zipCode
+			or just employee. The status object will exported to the page scope,
+			specifically for this bean or bean property.</description>
+			<name>path</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Set whether to ignore a nested path, if any.
+			Default is to not ignore.</description>
+			<name>ignoreNestedPath</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Set HTML escaping for this tag, as boolean value. Overrides
+			the default HTML escaping setting for the current page.</description>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+
+	<tag>
+		<description>Provides transformation of variables to Strings, using an appropriate
+		custom PropertyEditor from BindTag (can only be used inside BindTag). The HTML
+		escaping flag participates in a page-wide or application-wide setting (i.e. by
+		HtmlEscapeTag or a 'defaultHtmlEscape' context-param in web.xml).</description>
+		<name>transform</name>
+		<tag-class>org.springframework.web.servlet.tags.TransformTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>The value to transform. This is the actual object you want
+			to have transformed (for instance a Date). Using the PropertyEditor that
+			is currently in use by the 'spring:bind' tag.</description>
+			<name>value</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The string to use when binding the result to the page,
+			request, session or application scope. If not specified, the result gets
+			outputted to the writer (i.e. typically directly to the JSP).</description>
+			<name>var</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The scope to use when exported the result to a variable.
+			This attribute is only used when var is also set. Possible values are
+			page, request, session and application.</description>
+			<name>scope</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Set HTML escaping for this tag, as boolean value. Overrides
+			the default HTML escaping setting for the current page.</description>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+
+	<tag>
+		<description>URL tag based on the JSTL c:url tag. This variant is fully
+		backwards compatible with the standard tag. Enhancements include support
+		for URL template parameters.</description>
+		<name>url</name>
+		<tag-class>org.springframework.web.servlet.tags.UrlTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>The URL to build. This value can include template place holders
+			that are replaced with the URL encoded value of the named parameter. Parameters
+			must be defined using the param tag inside the body of this tag.</description>
+			<name>value</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Specifies a remote application context path. The default is the
+			current application context path.</description>
+			<name>context</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The name of the variable to export the URL value to.</description>
+			<name>var</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The scope for the var. 'application', 'session', 'request' and
+			'page' scopes are supported. Defaults to page scope. This attribute has no
+			effect unless the var attribute is also defined.</description>
+			<name>scope</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Set HTML escaping for this tag, as a boolean value. Overrides the
+			default HTML escaping setting for the current page.</description>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Set JavaScript escaping for this tag, as a boolean value.
+			Default is 'false'.</description>
+			<name>javaScriptEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+
+	<tag>
+		<description>Parameter tag based on the JSTL c:param tag. The sole purpose is to
+		support params inside the spring:url tag.</description>
+		<name>param</name>
+		<tag-class>org.springframework.web.servlet.tags.ParamTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>The name of the parameter.</description>
+			<name>name</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The value of the parameter.</description>
+			<name>value</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+
+	<tag>
+		<description>Evaluates a Spring expression (SpEL) and either prints the result
+		or assigns it to a variable.</description>
+		<name>eval</name>
+		<tag-class>org.springframework.web.servlet.tags.EvalTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>The expression to evaluate.</description>
+			<name>expression</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The name of the variable to export the evaluation result to.</description>
+			<name>var</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The scope for the var. 'application', 'session', 'request' and
+			'page' scopes are supported. Defaults to page scope. This attribute has no
+			effect unless the var attribute is also defined.</description>
+			<name>scope</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Set HTML escaping for this tag, as a boolean value. Overrides the
+			default HTML escaping setting for the current page.</description>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Set JavaScript escaping for this tag, as a boolean value.
+			Default is 'false'.</description>
+			<name>javaScriptEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+
+    <function>
+        <description>Helps to prepare a URL to a Spring MVC controller method.</description>
+        <name>mvcUrl</name>
+        <function-class>org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder</function-class>
+        <function-signature>org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder.MethodArgumentBuilder fromMappingName(java.lang.String)</function-signature>
+    </function>
+
+</taglib>
diff --git a/src/main/webapp/breadcrumb.jsp b/src/main/webapp/WEB-INF/view/admin/breadcrumb.jsp
similarity index 90%
rename from src/main/webapp/breadcrumb.jsp
rename to src/main/webapp/WEB-INF/view/admin/breadcrumb.jsp
index 18b3d37..130cfba 100644
--- a/src/main/webapp/breadcrumb.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/breadcrumb.jsp
@@ -3,7 +3,6 @@
 
 <ol class="breadcrumb">
 <c:forEach items="${sessionScope.breadcrumbs}" var="bread" varStatus="s">
-	${bread.view }/${bread.name }
 	<c:if test="${not s.last }">
 		<li><a href="${bread.view }">${bread.name }</a></li>
 	</c:if>
diff --git a/src/main/webapp/WEB-INF/view/admin/nav.jsp b/src/main/webapp/WEB-INF/view/admin/nav.jsp
index 42045e1..282dfc0 100644
--- a/src/main/webapp/WEB-INF/view/admin/nav.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/nav.jsp
@@ -110,12 +110,17 @@
                         <ul class="nav nav-second-level">
                         	<shiro:hasPermission name="standard">
                             <li>
-                                <a href="${pageContext.request.contextPath}/standard.do/standard.view"> 规格管理</a>
+                                <a href="${pageContext.request.contextPath}/standard.do/standard.view/0/10"> 规格管理</a>
                             </li>
                         	</shiro:hasPermission>
                         	<shiro:hasPermission name="car">
                             <li>
-                                <a href="${pageContext.request.contextPath}/car.do/car.view/0"> 车辆管理</a>
+                                <a href="${pageContext.request.contextPath}/car.do/car.view/0/10"> 车辆管理</a>
+                            </li>
+                        	</shiro:hasPermission>
+                        	<shiro:hasPermission name="agent">
+                            <li>
+                                <a href="${pageContext.request.contextPath}/agent.do/agent.view/0/10"> 车辆管理</a>
                             </li>
                         	</shiro:hasPermission>
                         </ul>
diff --git a/src/main/webapp/WEB-INF/view/admin/pageSplit.jsp b/src/main/webapp/WEB-INF/view/admin/pageSplit.jsp
index a8d3940..2c16684 100644
--- a/src/main/webapp/WEB-INF/view/admin/pageSplit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/pageSplit.jsp
@@ -1,24 +1,39 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://shiro.apache.org/tags" prefix="shiro" %>
-<!DOCTYPE html>
-  <c:if test="${page.hasPreviousPage  == true}">
-             <a href="0" class="btn btn-primary" role="button">首页</a>
-             <a href="${page.prePage}" class="btn btn-primary" role="button">上一页</a>
-        </c:if>
-        <c:forEach begin="1" end="${page.pages}" var="each">
-            <c:choose>
-                 <c:when test="${each == page.pageNum}">
-                     <a href="${each}" class="btn btn-primary" role="button">${each}</a>
-                </c:when>
-                 <c:when test="${each >= (page.pageNum - 2) && each <= (page.pageNum + 2)}">
-                  <a href="${each}" class="btn btn-primary" role="button">${each}</a>
-                </c:when>
-            </c:choose>
-        </c:forEach>
-         <c:if test="${page.hasNextPage }">
-             <a href="${page.nextPage}" class="btn btn-primary" role="button">下一页</a>
-	         <a href="${page.pages}" class="btn btn-primary" role="button">尾页</a>
-         </c:if>
-  共${page.pages}页
- 
\ No newline at end of file
+<%@ page contentType="text/html;charset=UTF-8" language="java"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<nav class="navbar navbar-default" role="navigation">
+	<div class="container-fluid">
+		<div class="navbar-header">
+			<a class="navbar-brand" href="#">显示</a>
+		</div>
+		<div class="navbar-form navbar-left" role="search">
+			<select class="form-control pageSize">
+				<option value="10" <c:if test="${page.pageSize==10 }">selected</c:if>>10</option>
+				<option value="25" <c:if test="${page.pageSize==25 }">selected</c:if>>25</option>
+				<option value="50" <c:if test="${page.pageSize==50 }">selected</c:if>>50</option>
+				<option value="100" <c:if test="${page.pageSize==100 }">selected</c:if>>100</option>
+			</select>
+		</div>
+		<div class="pull-right" style="margin-top: 8px;">
+			<c:if test="${page.hasPreviousPage  == true}">
+				<a data-value="0" class="btn btn-primary pageNum" role="button">首页</a>
+				<a data-value="${page.prePage}" class="btn btn-primary btn-sm" role="button">上一页</a>
+			</c:if>
+			<c:forEach begin="1" end="${page.pages}" var="each">
+				<c:choose>
+					<c:when test="${each == page.pageNum}">
+						<a data-value="${each}" class="btn btn-default btn-sm disabled pageNum" role="button">${each}</a>
+					</c:when>
+					<c:when test="${each >= (page.pageNum - 2) && each <= (page.pageNum + 2)}">
+						<a data-value="${each}" class="btn btn-primary btn-sm pageNum" role="button">${each}</a>
+					</c:when>
+				</c:choose>
+			</c:forEach>
+			<c:if test="${page.hasNextPage }">
+				<a data-value="${page.nextPage}" class="btn btn-primary btn-sm pageNum" role="button">下一页</a>
+				<a data-value="${page.pages}" class="btn btn-primary btn-sm pageNum" role="button">尾页</a>
+			</c:if>
+			共${page.pages}页
+		</div>
+	</div>
+</nav>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/view/admin/system/resource/resource.jsp b/src/main/webapp/WEB-INF/view/admin/system/resource/resource.jsp
index 057310b..36fd66e 100644
--- a/src/main/webapp/WEB-INF/view/admin/system/resource/resource.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/system/resource/resource.jsp
@@ -5,7 +5,7 @@
 <!-- Page Content -->
 <div id="page-wrapper">
     <div class="container-fluid">
-    	<jsp:include page="/breadcrumb.jsp"></jsp:include>
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
         <div>
             <h1 class="page-header">权限管理</h1>
         </div>
diff --git a/src/main/webapp/WEB-INF/view/admin/system/resource/resource_add.jsp b/src/main/webapp/WEB-INF/view/admin/system/resource/resource_add.jsp
index a5dd721..a9bbc00 100644
--- a/src/main/webapp/WEB-INF/view/admin/system/resource/resource_add.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/system/resource/resource_add.jsp
@@ -5,7 +5,7 @@
 <!-- Page Content -->
 <div id="page-wrapper">
     <div class="container-fluid">
-    	<jsp:include page="/breadcrumb.jsp"></jsp:include>
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
         <div>
             <h1 class="page-header">权限管理</h1>
         </div>
diff --git a/src/main/webapp/WEB-INF/view/admin/system/role/role.jsp b/src/main/webapp/WEB-INF/view/admin/system/role/role.jsp
index 1d12769..5a34435 100644
--- a/src/main/webapp/WEB-INF/view/admin/system/role/role.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/system/role/role.jsp
@@ -5,7 +5,7 @@
 <!-- Page Content -->
 <div id="page-wrapper">
     <div class="container-fluid">
-		<jsp:include page="/breadcrumb.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
         <div>
             <h1 class="page-header">角色管理</h1>
         </div>
diff --git a/src/main/webapp/WEB-INF/view/admin/system/role/role_add.jsp b/src/main/webapp/WEB-INF/view/admin/system/role/role_add.jsp
index 8624eba..e4de033 100644
--- a/src/main/webapp/WEB-INF/view/admin/system/role/role_add.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/system/role/role_add.jsp
@@ -5,7 +5,7 @@
 <!-- Page Content -->
 <div id="page-wrapper">
     <div class="container-fluid">
-		<jsp:include page="/breadcrumb.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
         <div>
             <h1 class="page-header">用户管理</h1>
         </div>
diff --git a/src/main/webapp/WEB-INF/view/admin/system/role/role_update.jsp b/src/main/webapp/WEB-INF/view/admin/system/role/role_update.jsp
index 8606bc9..546f80b 100644
--- a/src/main/webapp/WEB-INF/view/admin/system/role/role_update.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/system/role/role_update.jsp
@@ -6,7 +6,7 @@
 <!-- Page Content -->
 <div id="page-wrapper">
     <div class="container-fluid">
-    	<jsp:include page="/breadcrumb.jsp"></jsp:include>
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
         <div>
             <h1 class="page-header">角色管理</h1>
         </div>
diff --git a/src/main/webapp/WEB-INF/view/admin/system/user/user.jsp b/src/main/webapp/WEB-INF/view/admin/system/user/user.jsp
index 119618e..f0944ba 100644
--- a/src/main/webapp/WEB-INF/view/admin/system/user/user.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/system/user/user.jsp
@@ -5,7 +5,7 @@
 <!-- Page Content -->
 <div id="page-wrapper">
     <div class="container-fluid">
-    	<jsp:include page="/breadcrumb.jsp"></jsp:include>
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
         <div>
             <h1 class="page-header">用户管理</h1>
         </div>
diff --git a/src/main/webapp/WEB-INF/view/admin/system/user/user_add.jsp b/src/main/webapp/WEB-INF/view/admin/system/user/user_add.jsp
index a15acd6..7422a6a 100644
--- a/src/main/webapp/WEB-INF/view/admin/system/user/user_add.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/system/user/user_add.jsp
@@ -5,7 +5,7 @@
 <!-- Page Content -->
 <div id="page-wrapper">
     <div class="container-fluid">
-    	<jsp:include page="/breadcrumb.jsp"></jsp:include>
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
         <div>
             <h1 class="page-header">用户管理</h1>
         </div>
diff --git a/src/main/webapp/WEB-INF/view/admin/system/user/user_update.jsp b/src/main/webapp/WEB-INF/view/admin/system/user/user_update.jsp
index b4d0105..0b419c5 100644
--- a/src/main/webapp/WEB-INF/view/admin/system/user/user_update.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/system/user/user_update.jsp
@@ -6,7 +6,7 @@
 <!-- Page Content -->
 <div id="page-wrapper">
     <div class="container-fluid">
-    	<jsp:include page="/breadcrumb.jsp"></jsp:include>
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
         <div>
             <h1 class="page-header">用户管理</h1>
         </div>
diff --git a/src/main/webapp/WEB-INF/view/vm/agent/agent.jsp b/src/main/webapp/WEB-INF/view/vm/agent/agent.jsp
new file mode 100644
index 0000000..066822e
--- /dev/null
+++ b/src/main/webapp/WEB-INF/view/vm/agent/agent.jsp
@@ -0,0 +1,103 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
+<!-- Page Content -->
+<div id="page-wrapper">
+    <div class="container-fluid">
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
+        <div class="panel-heading">
+        </div>
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        车辆信息
+                    </div>
+                    <!-- /.panel-heading -->
+                    <div class="panel-body">
+                        <div class="dataTable_wrapper">
+                        	<form class="searchForm form-horizontal" action="${pageContext.request.contextPath}/car.do/car.view/0" method="post">
+                        		<h5>查询条件</h5>
+                        		<div class="form-group">
+	                                <label class="col-sm-1 control-label">高</label>
+	                                <div class="col-sm-2">
+	                                	<input class="form-control" type="number" name="high">
+	                                </div>
+	                                <label class="col-sm-1 control-label">长</label>
+	                                <div class="col-sm-2">
+	                                	<input class="form-control" type="number" name="length">
+	                                </div>
+	                                <label class="col-sm-1 control-label">宽</label>
+	                                <div class="col-sm-2">
+	                                	<input class="form-control" type="number" name="wide">
+	                                </div>
+	                                <label class="col-sm-1 control-label">重</label>
+	                                <div class="col-sm-2">
+	                                	<input class="form-control" type="number" name="weight">
+	                                </div>
+                                </div>
+                                <div class="form-group">
+                                	<label class="col-sm-10 control-label"></label>
+                                	<div class="col-sm-1">
+                                		<button type="submit" class="btn btn-primary form-control">查询</button>
+                                	</div>
+                                	<div class="col-sm-1">
+                                		<button type="reset" class="btn btn-primary form-control">重置</button>
+                                	</div>
+                                	<div class="col-sm-1">
+                                		<a href="${pageContext.request.contextPath}/car.do/car_add.view" class="btn btn-primary" role="button">新增</a>
+                                	</div>
+                                </div>
+                        	</form>
+                            <table class="table table-striped table-bordered table-hover" id="dataTables-example">
+                                <thead>
+                                <tr>
+                                    <th>车辆编号</th>
+                                    <th>是否上架</th>
+                                    <th>高</th>
+                                    <th>长</th>
+                                    <th>宽</th>
+                                    <th>重</th>
+                                    <th>操作</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <c:forEach var="car" items="${carList}">
+                                    <tr>
+                                        <td>${car.carId}</td>
+                                        <td>
+                                        	<c:choose>
+                                        		<c:when test="${car.isSale}">上架</c:when>
+                                        		<c:otherwise>下架</c:otherwise>
+                                        	</c:choose>
+                                        </td>
+                                        <td>${car.high}</td>
+                                        <td>${car.length}</td>
+                                        <td>${car.wide}</td>
+                                        <td>${car.weight}</td>
+                                        <td>
+                                            <a href="${pageContext.request.contextPath}/car.do/car_update.view?id=${car.id}">修改</a>
+                                            <a href="${pageContext.request.contextPath}/car.do/delete?id=${car.id}"
+                                               onclick="return confirm('是否要删除该车辆')">删除</a>
+                                        </td>
+                                    </tr>
+                                </c:forEach>
+                                </tbody>
+                            </table>
+                           <jsp:include page="/WEB-INF/view/admin/pageSplit.jsp"></jsp:include>
+                        </div>
+                        <!-- /.table-responsive -->
+                    </div>
+                    <!-- /.panel-body -->
+                </div>
+                <!-- /.panel -->
+            </div>
+            <!-- /.col-lg-12 -->
+        </div>
+    </div>
+
+    <!-- /.container-fluid -->
+</div>
+
+<jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
+
diff --git a/src/main/webapp/WEB-INF/view/vm/agent/agent_add.jsp b/src/main/webapp/WEB-INF/view/vm/agent/agent_add.jsp
new file mode 100644
index 0000000..40e2f4b
--- /dev/null
+++ b/src/main/webapp/WEB-INF/view/vm/agent/agent_add.jsp
@@ -0,0 +1,84 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
+<!-- Page Content -->
+<div id="page-wrapper">
+    <div class="container-fluid">
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
+        <div>
+            <h1 class="page-header">车辆管理</h1>
+        </div>
+        <div class="panel-heading">
+        </div>
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        车辆管理
+                    </div>
+                    <!-- /.panel-heading -->
+                    <div class="panel-body">
+                        <div class="dataTable_wrapper">
+                            <form class="form-horizontal" action="${pageContext.request.contextPath}/car.do/add" method="post">
+                            	<div class="form-group">
+	                                <label class="col-sm-1 control-label">编号</label>
+	                                <div class="col-sm-11">
+	                                	<select class="selectpicker form-control" name="carId">
+	                                		<c:forEach items="${standardList }" var="standard">
+	                                			<option value="${standard.carId }">${standard.carId }</option>
+	                                		</c:forEach>
+	                                	</select>
+	                                </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">是否上架</label>
+	                                <div class="col-sm-11">
+		                                <select class="selectpicker form-control" name="isSale">
+		                                	<option value="true">上架</option>
+		                                	<option value="false">下架</option>
+		                                </select>
+		                             </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">高</label>
+	                                <div class="col-sm-11">
+	                                	<input class="form-control" type="number" name="high">
+	                                </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">长</label>
+	                                <div class="col-sm-11">
+	                                	<input class="form-control" type="number" name="length">
+	                                </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">宽</label>
+	                                <div class="col-sm-11">
+	                                	<input class="form-control" type="number" name="wide">
+	                                </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">重量</label>
+	                                <div class="col-sm-11">
+	                               		<input class="form-control" type="number" name="weight">
+	                               	</div>
+                                </div>
+                                <label></label>
+                                <button type="submit"
+                                        class="btn btn-primary form-control">添加
+                                </button>
+                            </form>
+                        </div>
+                        <!-- /.table-responsive -->
+                    </div>
+                    <!-- /.panel-body -->
+                </div>
+                <!-- /.panel -->
+            </div>
+            <!-- /.col-lg-12 -->
+        </div>
+    </div>
+
+    <!-- /.container-fluid -->
+</div>
+<jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
diff --git a/src/main/webapp/WEB-INF/view/vm/agent/agent_update.jsp b/src/main/webapp/WEB-INF/view/vm/agent/agent_update.jsp
new file mode 100644
index 0000000..3beaf10
--- /dev/null
+++ b/src/main/webapp/WEB-INF/view/vm/agent/agent_update.jsp
@@ -0,0 +1,86 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
+
+<!-- Page Content -->
+<div id="page-wrapper">
+    <div class="container-fluid">
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
+        <div>
+            <h1 class="page-header">车辆管理</h1>
+        </div>
+        <div class="panel-heading">
+        </div>
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        车辆信息
+                    </div>
+                    <!-- /.panel-heading -->
+                    <div class="panel-body">
+                        <div class="dataTable_wrapper">
+                            <form class="form-horizontal" action="${pageContext.request.contextPath}/car.do/update" method="post">
+                                <input name="id" type="hidden" value="${car.id }">
+                                <div class="form-group">
+                                	<label class="col-sm-1 control-label">编号</label>
+                                	<div class="col-sm-11">
+                                		<select class="selectpicker form-control" name="carId">
+	                                		<c:forEach items="${standardList }" var="standard">
+	                                			<option <c:if test="${car.carId==standard.carId }">selected</c:if> value="${standard.carId }">${standard.carId }</option>
+	                                		</c:forEach>
+	                                	</select>
+                                	</div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">是否上架</label>
+	                                <div class="col-sm-11">
+		                                <select class="selectpicker form-control" name="isSale">
+		                                	<option value="true" <c:if test="${car.isSale }">selected</c:if>>上架</option>
+		                                	<option value="false" <c:if test="${not car.isSale }">selected</c:if>>下架</option>
+		                                </select>
+	                                </div>
+	                            </div>
+	                            <div class="form-group">
+	                                <label class="col-sm-1 control-label">高</label>
+	                                <div class="col-sm-11">
+	                                	<input class="form-control" type="number" name="high" value="${car.high }">
+	                                </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">长</label>
+	                                <div class="col-sm-11">
+	                                	<input class="form-control" type="number" name="length" value="${car.length }">
+	                                </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">宽</label>
+	                                <div class="col-sm-11">
+	                                	<input class="form-control" type="number" name="wide" value="${car.wide }">
+	                                </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">重量</label>
+	                                <div class="col-sm-11">
+	                                	<input class="form-control" type="number" name="weight" value="${car.weight }">
+	                                </div>
+                                </div>
+                                <label class="col-sm-2 control-label"></label>
+                                <button type="submit"
+                                        class="btn btn-primary form-control">修改
+                                </button>
+                            </form>
+                        </div>
+                        <!-- /.table-responsive -->
+                    </div>
+                    <!-- /.panel-body -->
+                </div>
+                <!-- /.panel -->
+            </div>
+            <!-- /.col-lg-12 -->
+        </div>
+    </div>
+
+    <!-- /.container-fluid -->
+</div>
+<jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
diff --git a/src/main/webapp/WEB-INF/view/vm/car/car.jsp b/src/main/webapp/WEB-INF/view/vm/car/car.jsp
index 3cf3141..bc50761 100644
--- a/src/main/webapp/WEB-INF/view/vm/car/car.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/car/car.jsp
@@ -1,10 +1,11 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://www.springframework.org/tags/form"  prefix="form"%>
 <jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
 <!-- Page Content -->
 <div id="page-wrapper">
     <div class="container-fluid">
-    	<jsp:include page="/breadcrumb.jsp"></jsp:include>
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
         <div class="panel-heading">
         </div>
         <div class="row">
@@ -16,12 +17,28 @@
                     <!-- /.panel-heading -->
                     <div class="panel-body">
                         <div class="dataTable_wrapper">
-                        	<form class="searchForm form-horizontal" action="${pageContext.request.contextPath}/car.do/car.view/0" method="post">
-                        		<h5>查询条件</h5>
+                        	<form:form cssClass="searchForm form-horizontal" commandName="car" action="${pageContext.request.contextPath}/car.do/car.view/" method="post">
+                        		<button type="button" class="btn btn-default pull-right" id="toggle-advanced-search">查询条件<i class="fa fa-angle-double-down"></i></button>
+                        		<div class="clearfix"></div>
+                        		<div class="row-fluid" id="div-advanced-search" style="display:none;">
+                        		<div class="form-group">
+                        			<label class="col-sm-1 control-label">车辆编号</label>
+	                                <div class="col-sm-2">
+	                                	<form:input path="carId" cssClass="form-control"/>
+	                                </div>
+                        			<label class="col-sm-1 control-label">是否上架</label>
+	                                <div class="col-sm-2">
+	                                	<form:select path="isSale" cssClass="form-control">
+	                                		<form:option value=""/>
+	                                		<form:option label="上架" value="true"/>
+	                                		<form:option label="下架" value="false"/>
+	                                	</form:select>
+	                                </div>
+                        		</div>
                         		<div class="form-group">
 	                                <label class="col-sm-1 control-label">高</label>
 	                                <div class="col-sm-2">
-	                                	<input class="form-control" type="number" name="high">
+	                                	<input class="form-control" type="number" name="high" value="">
 	                                </div>
 	                                <label class="col-sm-1 control-label">长</label>
 	                                <div class="col-sm-2">
@@ -36,19 +53,22 @@
 	                                	<input class="form-control" type="number" name="weight">
 	                                </div>
                                 </div>
+                                </div>
                                 <div class="form-group">
-                                	<label class="col-sm-10 control-label"></label>
+                                	<div class="col-sm-2">
+                                		<a href="${pageContext.request.contextPath}/car.do/car_add.view" class="btn btn-primary" role="button">新增</a>
+                                		<button type="button" class="btn btn-primary" onclick="uploader.uploadModal('${pageContext.request.contextPath}/car.do/import','${pageContext.request.contextPath}/template/car_tpl.xlsx')">批量上传</button>
+                                	</div>
+                                	<label class="col-sm-8 control-label"></label>
+                                	<div id="searchBtns" style="display:none;">
                                 	<div class="col-sm-1">
-                                		<button type="submit" class="btn btn-primary form-control">查询</button>
+                                		<button type="button" class="btn btn-primary form-control searchBtn">查询</button>
                                 	</div>
                                 	<div class="col-sm-1">
                                 		<button type="reset" class="btn btn-primary form-control">重置</button>
                                 	</div>
-                                	<div class="col-sm-1">
-                                		<a href="${pageContext.request.contextPath}/car.do/car_add.view" class="btn btn-primary" role="button">新增</a>
                                 	</div>
                                 </div>
-                        	</form>
                             <table class="table table-striped table-bordered table-hover" id="dataTables-example">
                                 <thead>
                                 <tr>
@@ -85,6 +105,7 @@
                                 </tbody>
                             </table>
                            <jsp:include page="/WEB-INF/view/admin/pageSplit.jsp"></jsp:include>
+                        </form:form>
                         </div>
                         <!-- /.table-responsive -->
                     </div>
diff --git a/src/main/webapp/WEB-INF/view/vm/car/car_add.jsp b/src/main/webapp/WEB-INF/view/vm/car/car_add.jsp
index b4b6724..40e2f4b 100644
--- a/src/main/webapp/WEB-INF/view/vm/car/car_add.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/car/car_add.jsp
@@ -4,7 +4,7 @@
 <!-- Page Content -->
 <div id="page-wrapper">
     <div class="container-fluid">
-    	<jsp:include page="/breadcrumb.jsp"></jsp:include>
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
         <div>
             <h1 class="page-header">车辆管理</h1>
         </div>
diff --git a/src/main/webapp/WEB-INF/view/vm/car/car_update.jsp b/src/main/webapp/WEB-INF/view/vm/car/car_update.jsp
index 40da84f..3beaf10 100644
--- a/src/main/webapp/WEB-INF/view/vm/car/car_update.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/car/car_update.jsp
@@ -5,7 +5,7 @@
 <!-- Page Content -->
 <div id="page-wrapper">
     <div class="container-fluid">
-    	<jsp:include page="/breadcrumb.jsp"></jsp:include>
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
         <div>
             <h1 class="page-header">车辆管理</h1>
         </div>
diff --git a/src/main/webapp/WEB-INF/view/vm/standard/standard.jsp b/src/main/webapp/WEB-INF/view/vm/standard/standard.jsp
index 705f18f..a9ac030 100644
--- a/src/main/webapp/WEB-INF/view/vm/standard/standard.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/standard/standard.jsp
@@ -1,10 +1,11 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://www.springframework.org/tags/form"  prefix="form"%>
 <jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
 <!-- Page Content -->
 <div id="page-wrapper">
     <div class="container-fluid">
-    	<jsp:include page="/breadcrumb.jsp"></jsp:include>
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
         <div>
             <h1 class="page-header">规格管理</h1>
         </div>
@@ -19,6 +20,31 @@
                     <!-- /.panel-heading -->
                     <div class="panel-body">
                         <div class="dataTable_wrapper">
+                        	<form:form cssClass="searchForm form-horizontal" commandName="standard" action="${pageContext.request.contextPath}/standard.do/standard.view/" method="post">
+                        		<button type="button" class="btn btn-default pull-right" id="toggle-advanced-search">查询条件<i class="fa fa-angle-double-down"></i></button>
+                        		<div class="clearfix"></div>
+                        		<div class="row-fluid" id="div-advanced-search" style="display:none;">
+                        		<div class="form-group">
+                        			<label class="col-sm-1 control-label">新增</label>
+	                                <div class="col-sm-2">
+	                                	<form:input path="carId" cssClass="form-control"/>
+	                                </div>
+                        		</div>
+                                </div>
+                                <div class="form-group">
+                                	<div class="col-sm-2">
+                                		<a href="${pageContext.request.contextPath}/standard.do/standard_add.view" class="btn btn-primary" role="button">添加规格</a>
+                                	</div>
+                                	<label class="col-sm-8 control-label"></label>
+                                	<div id="searchBtns" style="display:none;">
+                                	<div class="col-sm-1">
+                                		<button type="button" class="btn btn-primary form-control searchBtn">查询</button>
+                                	</div>
+                                	<div class="col-sm-1">
+                                		<button type="reset" class="btn btn-primary form-control">重置</button>
+                                	</div>
+                                	</div>
+                                </div>
                             <table class="table table-striped table-bordered table-hover" id="dataTables-example">
                                 <thead>
                                 <tr>
@@ -39,8 +65,8 @@
                                 </c:forEach>
                                 </tbody>
                             </table>
-                            <a href="${pageContext.request.contextPath}/standard.do/standard_add.view" class="btn btn-primary" role="button">添加规格</a>
-                            <jsp:include page="/WEB-INF/view/admin/pageSplit.jsp"></jsp:include>
+                           <jsp:include page="/WEB-INF/view/admin/pageSplit.jsp"></jsp:include>
+                        </form:form>
                         </div>
                         <!-- /.table-responsive -->
                     </div>
diff --git a/src/main/webapp/WEB-INF/view/vm/standard/standard_add.jsp b/src/main/webapp/WEB-INF/view/vm/standard/standard_add.jsp
index 718a644..b31ff16 100644
--- a/src/main/webapp/WEB-INF/view/vm/standard/standard_add.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/standard/standard_add.jsp
@@ -4,7 +4,7 @@
 <!-- Page Content -->
 <div id="page-wrapper">
     <div class="container-fluid">
-    	<jsp:include page="/breadcrumb.jsp"></jsp:include>
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
         <div>
             <h1 class="page-header">规格管理</h1>
         </div>
diff --git a/src/main/webapp/WEB-INF/view/vm/standard/standard_update.jsp b/src/main/webapp/WEB-INF/view/vm/standard/standard_update.jsp
index 64fc513..0d3189f 100644
--- a/src/main/webapp/WEB-INF/view/vm/standard/standard_update.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/standard/standard_update.jsp
@@ -5,7 +5,7 @@
 <!-- Page Content -->
 <div id="page-wrapper">
     <div class="container-fluid">
-    	<jsp:include page="/breadcrumb.jsp"></jsp:include>
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
         <div>
             <h1 class="page-header">规格管理</h1>
         </div>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 68e2771..ea48730 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -53,6 +53,10 @@
         <servlet-name>default</servlet-name>
         <url-pattern>*.css</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>default</servlet-name>
+        <url-pattern>*.less</url-pattern>
+    </servlet-mapping>
     <servlet-mapping>
         <servlet-name>default</servlet-name>
         <url-pattern>*.html</url-pattern>
@@ -73,7 +77,18 @@
         <servlet-name>default</servlet-name>
         <url-pattern>*.ttf</url-pattern>
     </servlet-mapping>
-
+	
+	<!-- tld配置 -->
+	<jsp-config>
+		<taglib>
+			<taglib-uri>http://www.springframework.org/tags/form</taglib-uri>
+			<taglib-location>tld/spring-form.tld</taglib-location>
+		</taglib>
+		<taglib>
+			<taglib-uri>http://www.springframework.org/tags</taglib-uri>
+			<taglib-location>tld/spring.tld</taglib-location>
+		</taglib>
+	</jsp-config>
 
     <!-- shiro 安全过滤器,要放在其他功能性过滤器的前边 -->
     <filter>
diff --git a/src/main/webapp/js/main.js b/src/main/webapp/js/main.js
index 45435f6..a506c54 100644
--- a/src/main/webapp/js/main.js
+++ b/src/main/webapp/js/main.js
@@ -2,7 +2,11 @@ $(document).ready(function () {
 	$('html').niceScroll({cursorcolor:"#ccc", horizrailenabled: false, enablekeyboard: false});
     dataTable = $('#dataTables-example').DataTable({
 	  //dom: '<"toolbar">',
+      searching: false,
+      ordering:  false,
+      paging: false,
       responsive: true,
+      info: false,
       language: {
     		"srocessing":   "处理中...",
     		"lengthMenu":   "显示 _MENU_ 项结果",
@@ -78,4 +82,30 @@ $(document).ready(function () {
 	    }
     };
     uploader.init();
+    
+    $("#toggle-advanced-search").click(function(){
+        $("i",this).toggleClass("fa-angle-double-down fa-angle-double-up");
+        $("#div-advanced-search").slideToggle("fast");
+        $('#searchBtns').fadeToggle("fast");
+    });
+    
+    //分页事件
+    $('.pageNum').click(function(){
+    	var action = $('.searchForm').attr('action');
+    	$('.searchForm').attr('action',action + $(this).data('value') + '/' + $('.pageSize').val());
+    	search();
+    });
+    $('.pageSize').change(function(){
+    	var action = $('.searchForm').attr('action');
+    	$('.searchForm').attr('action',action + '0/' + this.value);
+    	search();
+    });
+    $('.searchBtn').click(function(){
+    	var action = $('.searchForm').attr('action');
+    	$('.searchForm').attr('action',action + ($('.pageNum.disabled').data('value')?$('.pageNum.disabled').data('value'):0) + '/' + $('.pageSize').val());
+    	search();
+    });
+    function search() {
+    	$('.searchForm').submit();
+    }
   });
\ No newline at end of file

From 1d0bdacdb62f37b4a0633527aaad4f792009c5e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=8D=8E=E6=88=90?= <duhuacheng.ver@gmail.com>
Date: Tue, 14 Mar 2017 17:01:04 +0800
Subject: [PATCH 06/14] =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/breadcrumb-e-c.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/breadcrumb-e-c.properties b/src/main/resources/breadcrumb-e-c.properties
index 15ff0ba..c11d072 100644
--- a/src/main/resources/breadcrumb-e-c.properties
+++ b/src/main/resources/breadcrumb-e-c.properties
@@ -4,7 +4,7 @@ update=\u4FEE\u6539
 delete=\u5220\u9664
 login=\u9996\u9875
 role=\u89D2\u8272
-resource=\u8D44\u6E90
+resource=\u6743\u9650
 user=\u7528\u6237
 standard=\u89C4\u683C
 agent=\u4EE3\u7406\u5546

From eb4e51fcc29a83fc3fcc68df730600430bea96a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=8D=8E=E6=88=90?= <duhuacheng.ver@gmail.com>
Date: Tue, 14 Mar 2017 21:21:40 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/entity/Agent.java           | 118 +++++-----
 src/main/java/com/entity/User.java            |  11 +-
 .../com/entity/enumeration/AgentLevel.java    |  21 ++
 src/main/java/com/entity/vo/UserVo.java       |  20 --
 .../system/controller/LoginController.java    |  10 -
 .../com/system/controller/MainController.java |  14 --
 .../system/controller/ResourceController.java |  52 +++--
 .../com/system/controller/RoleController.java |  77 +++----
 .../com/system/controller/UserController.java |  40 ++--
 src/main/java/com/system/dao/ResourceDao.java |   8 +-
 .../java/com/system/service/ResourceBiz.java  |   7 +-
 src/main/java/com/system/service/UserBiz.java |   7 +-
 .../system/service/impl/ResourceBizImpl.java  |   9 +-
 .../com/system/service/impl/UserBizImpl.java  |  20 +-
 .../com/vm/controller/AgentController.java    |  27 +--
 .../java/com/vm/controller/CarController.java |  15 +-
 .../com/vm/controller/StandardController.java |   6 +
 src/main/webapp/WEB-INF/view/admin/nav.jsp    |   6 +-
 .../view/admin/system/resource/resource.jsp   |  12 +-
 .../admin/system/resource/resource_update.jsp |  51 +++++
 .../WEB-INF/view/admin/system/role/role.jsp   |  14 +-
 .../WEB-INF/view/admin/system/user/user.jsp   |  13 +-
 .../webapp/WEB-INF/view/vm/agent/agent.jsp    | 205 +++++++++---------
 .../WEB-INF/view/vm/agent/agent_add.jsp       |  10 +-
 .../WEB-INF/view/vm/agent/agent_update.jsp    |  24 +-
 src/main/webapp/WEB-INF/view/vm/car/car.jsp   |   8 +-
 26 files changed, 423 insertions(+), 382 deletions(-)
 create mode 100644 src/main/java/com/entity/enumeration/AgentLevel.java
 delete mode 100644 src/main/java/com/entity/vo/UserVo.java
 create mode 100644 src/main/webapp/WEB-INF/view/admin/system/resource/resource_update.jsp

diff --git a/src/main/java/com/entity/Agent.java b/src/main/java/com/entity/Agent.java
index 2838acf..48e04d4 100644
--- a/src/main/java/com/entity/Agent.java
+++ b/src/main/java/com/entity/Agent.java
@@ -1,84 +1,100 @@
 package com.entity;
 
 import java.io.Serializable;
+import java.util.Arrays;
+import java.util.List;
 
-import org.hibernate.validator.constraints.NotEmpty;
+import org.apache.commons.collections.ListUtils;
+import org.apache.commons.lang.StringUtils;
+
+import com.entity.enumeration.AgentLevel;
+import com.google.common.collect.Lists;
 
 public class Agent implements Serializable{
-	private static final long serialVersionUID = 6534271072663770032L;
+	private static final long serialVersionUID = 4678225051291399613L;
 	private Long id;
-	@NotEmpty
-    private Boolean isSale;
-	@NotEmpty
-    private String carId;
-	@NotEmpty
-    private Integer high;
-	@NotEmpty
-    private Integer length;
-	@NotEmpty
-    private Integer wide;
-	@NotEmpty
-    private Integer weight;
+    private AgentLevel level;
+    private String agentName;
+    private List<Long> clerkIds;
+    private String clerkIdsStr;
+    private String area;
 	
 	public Agent() {
 		super();
 	}
-	public Agent(String carId,Boolean isSale, Integer high,
-			Integer length, Integer wide, Integer weight) {
+
+	public Agent(AgentLevel level, String agentName, String clerkIdsStr,
+			String area) {
 		super();
-		this.isSale = isSale;
-		this.carId = carId;
-		this.high = high;
-		this.length = length;
-		this.wide = wide;
-		this.weight = weight;
+		this.level = level;
+		this.agentName = agentName;
+		this.setClerkIdsStr(clerkIdsStr);
+		this.area = area;
 	}
+
 	public Long getId() {
 		return id;
 	}
+
 	public void setId(Long id) {
 		this.id = id;
 	}
-	public Boolean getIsSale() {
-		return isSale;
-	}
-	public void setIsSale(Boolean isSale) {
-		this.isSale = isSale;
-	}
-	public String getCarId() {
-		return carId;
+
+	public AgentLevel getLevel() {
+		return level;
 	}
-	public void setCarId(String carId) {
-		this.carId = carId;
+
+	public void setLevel(AgentLevel level) {
+		this.level = level;
 	}
-	public Integer getHigh() {
-		return high;
+
+	public String getAgentName() {
+		return agentName;
 	}
-	public void setHigh(Integer high) {
-		this.high = high;
+
+	public void setAgentName(String agentName) {
+		this.agentName = agentName;
 	}
-	public Integer getLength() {
-		return length;
+
+	public List<Long> getClerkIds() {
+		return clerkIds;
 	}
-	public void setLength(Integer length) {
-		this.length = length;
+
+	public void setClerkIds(List<Long> clerkIds) {
+		this.clerkIds = clerkIds;
+		StringBuffer buff = new StringBuffer();
+		for(Long id : clerkIds) {
+			buff.append(id).append(',');
+		}
+		this.clerkIdsStr = buff.toString();
 	}
-	public Integer getWide() {
-		return wide;
+
+	public String getClerkIdsStr() {
+		return clerkIdsStr;
 	}
-	public void setWide(Integer wide) {
-		this.wide = wide;
+
+	public void setClerkIdsStr(String clerkIdsStr) {
+		this.clerkIdsStr = clerkIdsStr;
+		if(!StringUtils.isEmpty(clerkIdsStr)) {
+			this.clerkIds = Lists.newArrayList();
+			String[] ids = clerkIdsStr.split(",");
+			for(String id : ids) {
+				this.clerkIds.add(Long.parseLong(id));
+			}
+		}
 	}
-	public Integer getWeight() {
-		return weight;
+
+	public String getArea() {
+		return area;
 	}
-	public void setWeight(Integer weight) {
-		this.weight = weight;
+
+	public void setArea(String area) {
+		this.area = area;
 	}
+
 	@Override
 	public String toString() {
-		return "Car [id=" + id + ", isSale=" + isSale + ", carId=" + carId
-				+ ", high=" + high + ", length=" + length + ", wide=" + wide
-				+ ", weight=" + weight + "]";
+		return "Agent [id=" + id + ", level=" + level + ", agentName="
+				+ agentName + ", clerdIds=" + clerkIds + ", area=" + area + "]";
 	}
 }
diff --git a/src/main/java/com/entity/User.java b/src/main/java/com/entity/User.java
index 797ef46..813a46a 100644
--- a/src/main/java/com/entity/User.java
+++ b/src/main/java/com/entity/User.java
@@ -20,6 +20,7 @@ public class User {
     String salt;
     private List<Long> roleIds; //拥有的角色列表
     private String roleIdsStr;
+    private String roleDesc;
     private Boolean locked = Boolean.FALSE;
 
 
@@ -55,7 +56,15 @@ public List<Long> getRoleIds() {
         return roleIds;
     }
 
-    public void setRoleIds(List<Long> roleIds) {
+    public String getRoleDesc() {
+		return roleDesc;
+	}
+
+	public void setRoleDesc(String roleDesc) {
+		this.roleDesc = roleDesc;
+	}
+
+	public void setRoleIds(List<Long> roleIds) {
     	this.roleIds = roleIds;
     	StringBuilder s = new StringBuilder();
         int i = 0;
diff --git a/src/main/java/com/entity/enumeration/AgentLevel.java b/src/main/java/com/entity/enumeration/AgentLevel.java
new file mode 100644
index 0000000..73df30f
--- /dev/null
+++ b/src/main/java/com/entity/enumeration/AgentLevel.java
@@ -0,0 +1,21 @@
+package com.entity.enumeration;
+
+public enum AgentLevel {
+	VIP("VIP"),NORMAL("普通"),POTENTIAL("潜在"),NOCARE("不关注");
+	private String name;
+	AgentLevel(String name) {
+		this.name = name;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	public static void main(String[] args) {
+		for(AgentLevel entry : AgentLevel.values()) {
+			System.out.println(entry.getName()+":"+entry.name());
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/entity/vo/UserVo.java b/src/main/java/com/entity/vo/UserVo.java
deleted file mode 100644
index a6ec348..0000000
--- a/src/main/java/com/entity/vo/UserVo.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.entity.vo;
-
-import com.entity.User;
-
-/**
- * Created by c0de8ug on 16-2-21.
- */
-public class UserVo extends User {
-    String roleIdsStr;
-
-    @Override
-    public String getRoleIdsStr() {
-        return roleIdsStr;
-    }
-
-    @Override
-    public void setRoleIdsStr(String roleIdsStr) {
-        this.roleIdsStr = roleIdsStr;
-    }
-}
diff --git a/src/main/java/com/system/controller/LoginController.java b/src/main/java/com/system/controller/LoginController.java
index cc70b4d..a71e058 100644
--- a/src/main/java/com/system/controller/LoginController.java
+++ b/src/main/java/com/system/controller/LoginController.java
@@ -43,16 +43,6 @@ public String login(HttpServletRequest req, ModelMap modelMap, HttpSession sessi
             String principal = (String) subject.getPrincipal();
             session.setAttribute("username", principal);
             return "/admin/main";
-           /* switch (principal) {
-                case "admin":
-                    return "/admin/main";
-                case "teacher":
-                    return "/teacher/main";
-                case "student":
-                    return "/student/main";
-                case "supplier":
-                    return "redirect:supplier.do/supplier.view";
-            }*/
         }
 
         return "forward:login.jsp";
diff --git a/src/main/java/com/system/controller/MainController.java b/src/main/java/com/system/controller/MainController.java
index df61971..c461fe8 100644
--- a/src/main/java/com/system/controller/MainController.java
+++ b/src/main/java/com/system/controller/MainController.java
@@ -3,10 +3,6 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-/**
- * Created by c0de8ug on 16-2-16.
- */
-
 @Controller
 @RequestMapping("main.do")
 public class MainController {
@@ -15,14 +11,4 @@ public class MainController {
     public String adminMainView() {
         return "/admin/main";
     }
-
-    @RequestMapping("student")
-    public String studentMainView() {
-        return "/student/main";
-    }
-
-    @RequestMapping("teacher")
-    public String teacherMainView() {
-        return "/teacher/main";
-    }
 }
diff --git a/src/main/java/com/system/controller/ResourceController.java b/src/main/java/com/system/controller/ResourceController.java
index 1e23175..765d330 100644
--- a/src/main/java/com/system/controller/ResourceController.java
+++ b/src/main/java/com/system/controller/ResourceController.java
@@ -1,49 +1,75 @@
 package com.system.controller;
 
+import java.util.List;
+
 import org.apache.log4j.Logger;
-import org.apache.shiro.authz.annotation.RequiresRoles;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import com.entity.Resource;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.system.service.ResourceBiz;
 
-/**
- * Created by c0de8ug on 16-2-21.
- */
 @Controller
-
 @RequestMapping("/resource.do")
 public class ResourceController {
 	Logger log = Logger.getLogger(ResourceController.class);
 
 	 @Autowired
     private ResourceBiz resourceBiz;
-
-    @RequiresRoles("admin")
+	 
+	@RequiresPermissions("resource:query")
     @RequestMapping("resource.view")
     public String resourceView(Model model) {
-    	model.addAttribute("resourceList",resourceBiz.findAll());
+        return "forward:/resource.do/resource.view/0/10";
+    }
+
+	@RequiresPermissions("resource:query")
+    @RequestMapping("resource.view/{pageNum}/{pageSize}")
+    public String resourceView(Model model,@PathVariable("pageNum") int pageNum,
+    		@PathVariable("pageSize") int pageSize) {
+		PageHelper.startPage(pageNum, pageSize);
+		List<Resource> resourceList = resourceBiz.findAll();
+		PageInfo<Resource> page = new PageInfo<Resource>(resourceList);
+    	model.addAttribute("resourceList",resourceList);
+    	model.addAttribute("page",page);
         return "/admin/system/resource/resource";
     }
 
-    @RequiresRoles("admin")
+	@RequiresPermissions("resource:add")
     @RequestMapping("resource_add.view")
     public String resourceAddView(Model model) {
-        model.addAttribute("resourceList", resourceBiz.findAll());
         return "/admin/system/resource/resource_add";
     }
-
-    @RequiresRoles("admin")
+	
+	@RequiresPermissions("resource:add")
     @RequestMapping("add")
     public String add(com.entity.Resource resource, RedirectAttributes redirectAttributes) {
         resourceBiz.createResource(resource);
         return "redirect:/resource.do/resource.view";
     }
+	
+	@RequiresPermissions("resource:update")
+	@RequestMapping("resource_update.view")
+	public String resourceUpdateView(Long id,Model model) {
+		model.addAttribute("resource", resourceBiz.findOne(id));
+		return "/admin/system/resource/resource_update";
+	}
+	
+	@RequiresPermissions("resource:update")
+    @RequestMapping("update")
+    public String update(com.entity.Resource resource, RedirectAttributes redirectAttributes) {
+        resourceBiz.updateResource(resource);
+        return "redirect:/resource.do/resource.view";
+    }
 
-    @RequiresRoles("admin")
+	@RequiresPermissions("resource:delete")
     @RequestMapping("delete")
     public String delete(Long id, RedirectAttributes redirectAttributes) {
 		resourceBiz.deleteResource(id);
diff --git a/src/main/java/com/system/controller/RoleController.java b/src/main/java/com/system/controller/RoleController.java
index a5d1d73..ca162fa 100644
--- a/src/main/java/com/system/controller/RoleController.java
+++ b/src/main/java/com/system/controller/RoleController.java
@@ -1,13 +1,18 @@
 package com.system.controller;
 
-import org.apache.shiro.authz.annotation.RequiresRoles;
+import java.util.List;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.entity.Role;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.system.service.ResourceBiz;
 import com.system.service.RoleBiz;
 
@@ -25,22 +30,33 @@ public class RoleController {
 
     @Autowired
     private ResourceBiz resourceBiz;
-
-    @RequiresRoles("admin")
+    
+    @RequiresPermissions("role:query")
     @RequestMapping("role.view")
     public String roleView(Model model) {
-        model.addAttribute("roleList", roleBiz.findAll());
+        return "forward:/role.do/role.view/0/10";
+    }
+
+    @RequiresPermissions("role:query")
+    @RequestMapping("role.view/{pageNum}/{pageSize}")
+    public String roleView(Model model,@PathVariable("pageNum") int pageNum,
+    		@PathVariable("pageSize") int pageSize) {
+    	PageHelper.startPage(pageNum, pageSize);
+		List<Role> list = roleBiz.findAll();
+		PageInfo<Role> page = new PageInfo<Role>(list);
+    	model.addAttribute("roleList",list);
+    	model.addAttribute("page",page);
         return "/admin/system/role/role";
     }
 
-    @RequiresRoles("admin")
+    @RequiresPermissions("role:add")
     @RequestMapping("role_add.view")
     public String roleAddView(Model model) {
     	model.addAttribute("resourceList", resourceBiz.findAll());
         return "/admin/system/role/role_add";
     }
     
-    @RequiresRoles("admin")
+    @RequiresPermissions("role:update")
     @RequestMapping("role_update.view")
     public String roleUpdateView(Long id,Model model) {
     	model.addAttribute("role", roleBiz.findOne(id));
@@ -48,67 +64,24 @@ public String roleUpdateView(Long id,Model model) {
     	return "/admin/system/role/role_update";
     }
 
-    @RequiresRoles("admin")
+    @RequiresPermissions("role:add")
     @RequestMapping("add")
     public String add(Role role, RedirectAttributes redirectAttributes) {
         roleBiz.createRole(role);
         return "redirect:/role.do/role.view";
     }
     
-    @RequiresRoles("admin")
+    @RequiresPermissions("role:update")
     @RequestMapping("update")
     public String update(Role role, RedirectAttributes redirectAttributes) {
     	roleBiz.updateRole(role);
     	return "redirect:/role.do/role.view";
     }
 
-    @RequiresRoles("admin")
+    @RequiresPermissions("role:delete")
     @RequestMapping("delete")
     public String delete(Long id, RedirectAttributes redirectAttributes) {
         roleBiz.deleteRole(id);
         return "redirect:/role.do/role.view";
     }
-
-//
-//    @RequiresPermissions("role:create")
-//    @RequestMapping(value = "/create", method = RequestMethod.GET)
-//    public String showCreateForm(Model model) {
-//        setCommonData(model);
-//        model.addAttribute("role", new Role());
-//        model.addAttribute("op", "新增");
-//        return "role/edit";
-//    }
-//
-//    @RequiresPermissions("role:update")
-//    @RequestMapping(value = "/{id}/update", method = RequestMethod.GET)
-//    public String showUpdateForm(@PathVariable("id") Long id, Model model) {
-//        setCommonData(model);
-//        model.addAttribute("role", roleBiz.findOne(id));
-//        model.addAttribute("op", "修改");
-//        return "role/edit";
-//    }
-//
-//    @RequiresPermissions("role:update")
-//    @RequestMapping(value = "/{id}/update", method = RequestMethod.POST)
-//    public String update(Role role, RedirectAttributes redirectAttributes) {
-//        roleBiz.updateRole(role);
-//        redirectAttributes.addFlashAttribute("msg", "修改成功");
-//        return "redirect:/role";
-//    }
-//
-//    @RequiresPermissions("role:delete")
-//    @RequestMapping(value = "/{id}/delete", method = RequestMethod.GET)
-//    public String showDeleteForm(@PathVariable("id") Long id, Model model) {
-//        setCommonData(model);
-//        model.addAttribute("role", roleBiz.findOne(id));
-//        model.addAttribute("op", "删除");
-//        return "role/edit";
-//    }
-
-
-//    private void setCommonData(Model model) {
-//        model.addAttribute("resourceList", roleBiz.findAll());
-//    }
-
-
 }
diff --git a/src/main/java/com/system/controller/UserController.java b/src/main/java/com/system/controller/UserController.java
index 4705d5f..3e70f6e 100644
--- a/src/main/java/com/system/controller/UserController.java
+++ b/src/main/java/com/system/controller/UserController.java
@@ -1,23 +1,22 @@
 package com.system.controller;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.List;
 
-import org.apache.shiro.authz.annotation.RequiresRoles;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import com.entity.User;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.system.service.RoleBiz;
 import com.system.service.UserBiz;
 
-/**
- * Created by c0de8ug on 16-2-9.
- */
-
 @Controller
-@RequiresRoles("admin")
 @RequestMapping("user.do")
 public class UserController {
 
@@ -26,22 +25,33 @@ public class UserController {
 
 	@Autowired
     private RoleBiz roleBiz;
-
-    @RequiresRoles("admin")
+	
+	@RequiresPermissions("user:query")
     @RequestMapping("user.view")
-    public String userView(Model m) throws InvocationTargetException, IllegalAccessException {
-        m.addAttribute("userList", userBiz.findAll());
+    public String userView(Model model) {
+        return "forward:/user.do/user.view/0/10";
+    }
+
+	@RequiresPermissions("user:query")
+    @RequestMapping("user.view/{pageNum}/{pageSize}")
+    public String userView(Model m,@PathVariable("pageNum") int pageNum,
+    		@PathVariable("pageSize") int pageSize) throws InvocationTargetException, IllegalAccessException {
+		PageHelper.startPage(pageNum, pageSize);
+		List<User> list = userBiz.findAll();
+		PageInfo<User> page = new PageInfo<User>(list);
+    	m.addAttribute("userList",list);
+    	m.addAttribute("page",page);
         return "/admin/system/user/user";
     }
 
-    @RequiresRoles("admin")
+	@RequiresPermissions("user:add")
     @RequestMapping("user_add.view")
     public String userAddView(Model m) {
         m.addAttribute("roleList", roleBiz.findAll());
         return "/admin/system/user/user_add";
     }
 
-    @RequiresRoles("admin")
+	@RequiresPermissions("user:add")
     @RequestMapping("findById")
     public String findById(String id, Model m) {
         m.addAttribute("user", userBiz.findById(id));
@@ -49,14 +59,14 @@ public String findById(String id, Model m) {
         return "/admin/system/user/user_update";
     }
 
-    @RequiresRoles("admin")
+	@RequiresPermissions("user:update")
     @RequestMapping("update")
     public String update(User user) {
         userBiz.update(user);
         return "redirect:/user.do/user.view";
     }
 
-    @RequiresRoles("admin")
+	@RequiresPermissions("user:add")
     @RequestMapping("add")
     public String add(User user) {
 
@@ -64,7 +74,7 @@ public String add(User user) {
         return "redirect:/user.do/user.view";
     }
 
-    @RequiresRoles("admin")
+	@RequiresPermissions("user:delete")
     @RequestMapping("delete")
     public String delete(String id) {
         userBiz.delete(id);
diff --git a/src/main/java/com/system/dao/ResourceDao.java b/src/main/java/com/system/dao/ResourceDao.java
index e223b0f..f1ce376 100644
--- a/src/main/java/com/system/dao/ResourceDao.java
+++ b/src/main/java/com/system/dao/ResourceDao.java
@@ -5,21 +5,15 @@
 
 import com.entity.Resource;
 
-/**
- * <p>Resource: Zhang Kaitao
- * <p>Date: 14-1-28
- * <p>Version: 1.0
- */
 public interface ResourceDao {
 
     public void createResource(Resource resource);
 
-    public Resource updateResource(Resource resource);
+    public void updateResource(Resource resource);
 
     public void deleteResource(Long resourceId);
 
     Resource findOne(Long resourceId);
 
     List<Resource> findAll();
-
 }
diff --git a/src/main/java/com/system/service/ResourceBiz.java b/src/main/java/com/system/service/ResourceBiz.java
index 2fda6df..cc80c4c 100644
--- a/src/main/java/com/system/service/ResourceBiz.java
+++ b/src/main/java/com/system/service/ResourceBiz.java
@@ -6,16 +6,11 @@
 import java.util.List;
 import java.util.Set;
 
-/**
- * <p>User: Zhang Kaitao
- * <p>Date: 14-1-28
- * <p>Version: 1.0
- */
 public interface ResourceBiz {
 
 
     public void createResource(Resource resource);
-    public Resource updateResource(Resource resource);
+    public void updateResource(Resource resource);
     public void deleteResource(Long resourceId);
 
     Resource findOne(Long resourceId);
diff --git a/src/main/java/com/system/service/UserBiz.java b/src/main/java/com/system/service/UserBiz.java
index 025d623..176a9a4 100644
--- a/src/main/java/com/system/service/UserBiz.java
+++ b/src/main/java/com/system/service/UserBiz.java
@@ -1,18 +1,17 @@
 package com.system.service;
 
 
-import com.entity.User;
-import com.entity.vo.UserVo;
-
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 import java.util.Set;
 
+import com.entity.User;
+
 /**
  * Created by c0de8ug on 16-2-9.
  */
 public interface UserBiz {
-    public List<UserVo> findAll() throws InvocationTargetException, IllegalAccessException;
+    public List<User> findAll() throws InvocationTargetException, IllegalAccessException;
 
     public User findById(String id);
 
diff --git a/src/main/java/com/system/service/impl/ResourceBizImpl.java b/src/main/java/com/system/service/impl/ResourceBizImpl.java
index acba97e..9659a93 100644
--- a/src/main/java/com/system/service/impl/ResourceBizImpl.java
+++ b/src/main/java/com/system/service/impl/ResourceBizImpl.java
@@ -14,11 +14,6 @@
 import com.system.dao.ResourceDao;
 import com.system.service.ResourceBiz;
 
-/**
- * <p>User: Zhang Kaitao
- * <p>Date: 14-2-14
- * <p>Version: 1.0
- */
 @Service
 public class ResourceBizImpl implements ResourceBiz {
 
@@ -31,8 +26,8 @@ public void createResource(Resource resource) {
     }
 
     @Override
-    public Resource updateResource(Resource resource) {
-        return resourceDao.updateResource(resource);
+    public void updateResource(Resource resource) {
+        resourceDao.updateResource(resource);
     }
 
     @Override
diff --git a/src/main/java/com/system/service/impl/UserBizImpl.java b/src/main/java/com/system/service/impl/UserBizImpl.java
index 7d59d2b..14d0f8f 100644
--- a/src/main/java/com/system/service/impl/UserBizImpl.java
+++ b/src/main/java/com/system/service/impl/UserBizImpl.java
@@ -1,20 +1,17 @@
 package com.system.service.impl;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.entity.Role;
 import com.entity.User;
-import com.entity.vo.UserVo;
 import com.system.dao.RoleDao;
 import com.system.dao.UserDao;
 import com.system.service.RoleBiz;
@@ -40,11 +37,8 @@ public class UserBizImpl implements UserBiz {
     private RoleBiz roleBiz;
 
     @Override
-    public List<UserVo> findAll() throws InvocationTargetException, IllegalAccessException {
-        List<UserVo> userVoList = new ArrayList<>();
+    public List<User> findAll() throws InvocationTargetException, IllegalAccessException {
         List<User> userList = userDao.findAll();
-
-
         Iterator<User> iterator = userList.iterator();
 
         while (iterator.hasNext()) {
@@ -52,9 +46,6 @@ public List<UserVo> findAll() throws InvocationTargetException, IllegalAccessExc
             User user = (User) iterator.next();
             List<Long> roleIds = user.getRoleIds();
 
-            UserVo userVo = new UserVo();
-            BeanUtils.copyProperties(userVo, user);
-
             if (roleIds != null) {
                 int i = 0;
                 int size = roleIds.size();
@@ -66,15 +57,10 @@ public List<UserVo> findAll() throws InvocationTargetException, IllegalAccessExc
                 }
                 Role role = roleDao.findOne(roleIds.get(i));
                 s.append(role.getDescription());
-                userVo.setRoleIdsStr(s.toString());
+                user.setRoleDesc(s.toString());
             }
-
-
-            userVoList.add(userVo);
-
         }
-
-        return userVoList;
+        return userList;
     }
 
     @Override
diff --git a/src/main/java/com/vm/controller/AgentController.java b/src/main/java/com/vm/controller/AgentController.java
index e48d108..d5a4390 100644
--- a/src/main/java/com/vm/controller/AgentController.java
+++ b/src/main/java/com/vm/controller/AgentController.java
@@ -1,7 +1,6 @@
 package com.vm.controller;
 
 import java.util.List;
-import java.util.Map;
 
 import org.apache.log4j.Logger;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -9,18 +8,13 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.entity.Agent;
-import com.entity.Standard;
+import com.entity.enumeration.AgentLevel;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.util.ResultMapUtil;
 import com.vm.service.AgentBiz;
-import com.vm.service.StandardBiz;
 
 @Controller
 @RequestMapping("agent.do")
@@ -29,8 +23,12 @@ public class AgentController {
 
     @Autowired
     private AgentBiz agentBiz;
-    @Autowired
-    private StandardBiz standardBiz;
+    
+    @RequiresPermissions("agent:query")
+    @RequestMapping("agent.view")
+    public String agentView(Model model) {
+        return "forward:/agent.do/agent.view/0/10";
+    }
 
     @RequiresPermissions("agent:query")
     @RequestMapping("agent.view/{pageNum}/{pageSize}")
@@ -41,20 +39,19 @@ public String agentView(Agent agent,Model m,@PathVariable("pageNum") int pageNum
     	PageInfo<Agent> page = new PageInfo<Agent>(list);
         m.addAttribute("agentList", list);
         m.addAttribute("page", page);
+        m.addAttribute("agentLevel", AgentLevel.values());
         return "/vm/agent/agent";
     }
 
     @RequiresPermissions("agent:add")
     @RequestMapping("agent_add.view")
     public String agentAddView(Model m) {
-    	m.addAttribute("standardList", standardBiz.find(new Standard()));
         return "/vm/agent/agent_add";
     }
 
     @RequiresPermissions("agent:update")
     @RequestMapping("agent_update.view")
     public String agentUpdateView(Long id,Model m) {
-    	m.addAttribute("standardList", standardBiz.find(new Standard()));
     	m.addAttribute("agent",agentBiz.findById(id));
         return "/vm/agent/agent_update";
     }
@@ -79,12 +76,4 @@ public String delete(Long id) {
         agentBiz.delete(id);
         return "redirect:/agent.do/agent.view";
     }
-    
-    @RequiresPermissions("agent:delete")
-    @RequestMapping("test")
-    @ResponseBody
-    public Map<String,Object> test(@RequestBody String json) {
-        log.info(json.toString());
-        return ResultMapUtil.getSuccessMap("123");
-    }
 }
diff --git a/src/main/java/com/vm/controller/CarController.java b/src/main/java/com/vm/controller/CarController.java
index 35525cd..c01b106 100644
--- a/src/main/java/com/vm/controller/CarController.java
+++ b/src/main/java/com/vm/controller/CarController.java
@@ -16,7 +16,6 @@
 import org.springframework.ui.Model;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -39,6 +38,12 @@ public class CarController {
     private CarBiz carBiz;
     @Autowired
     private StandardBiz standardBiz;
+    
+    @RequiresPermissions("car:query")
+    @RequestMapping("car.view")
+    public String carView(Model model) {
+        return "forward:/car.do/car.view/0/10";
+    }
 
     @RequiresPermissions("car:query")
     @RequestMapping("car.view/{pageNum}/{pageSize}")
@@ -88,14 +93,6 @@ public String delete(Long id) {
         return "redirect:/car.do/car.view";
     }
     
-    @RequiresPermissions("car:delete")
-    @RequestMapping("test")
-    @ResponseBody
-    public Map<String,Object> test(@RequestBody String json) {
-        log.info(json.toString());
-        return ResultMapUtil.getSuccessMap("123");
-    }
-    
     @SuppressWarnings("resource")
 	@RequiresPermissions("car:import")
     @RequestMapping("import")
diff --git a/src/main/java/com/vm/controller/StandardController.java b/src/main/java/com/vm/controller/StandardController.java
index 9d3d477..dbe491a 100644
--- a/src/main/java/com/vm/controller/StandardController.java
+++ b/src/main/java/com/vm/controller/StandardController.java
@@ -20,6 +20,12 @@ public class StandardController {
 
     @Autowired
     private StandardBiz standardBiz;
+    
+    @RequiresPermissions("standard:query")
+    @RequestMapping("standard.view")
+    public String standardView(Model model) {
+        return "forward:/standard.do/standard.view/0/10";
+    }
 
     @RequiresPermissions("standard:query")
     @RequestMapping("standard.view/{pageNum}/{pageSize}")
diff --git a/src/main/webapp/WEB-INF/view/admin/nav.jsp b/src/main/webapp/WEB-INF/view/admin/nav.jsp
index 282dfc0..027f04b 100644
--- a/src/main/webapp/WEB-INF/view/admin/nav.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/nav.jsp
@@ -110,17 +110,17 @@
                         <ul class="nav nav-second-level">
                         	<shiro:hasPermission name="standard">
                             <li>
-                                <a href="${pageContext.request.contextPath}/standard.do/standard.view/0/10"> 规格管理</a>
+                                <a href="${pageContext.request.contextPath}/standard.do/standard.view"> 规格管理</a>
                             </li>
                         	</shiro:hasPermission>
                         	<shiro:hasPermission name="car">
                             <li>
-                                <a href="${pageContext.request.contextPath}/car.do/car.view/0/10"> 车辆管理</a>
+                                <a href="${pageContext.request.contextPath}/car.do/car.view"> 车辆管理</a>
                             </li>
                         	</shiro:hasPermission>
                         	<shiro:hasPermission name="agent">
                             <li>
-                                <a href="${pageContext.request.contextPath}/agent.do/agent.view/0/10"> 车辆管理</a>
+                                <a href="${pageContext.request.contextPath}/agent.do/agent.view"> 代理商管理</a>
                             </li>
                         	</shiro:hasPermission>
                         </ul>
diff --git a/src/main/webapp/WEB-INF/view/admin/system/resource/resource.jsp b/src/main/webapp/WEB-INF/view/admin/system/resource/resource.jsp
index 36fd66e..afad3c5 100644
--- a/src/main/webapp/WEB-INF/view/admin/system/resource/resource.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/system/resource/resource.jsp
@@ -20,6 +20,12 @@
                     <!-- /.panel-heading -->
                     <div class="panel-body">
                         <div class="dataTable_wrapper">
+                        	<form class="searchForm form-horizontal" action="${pageContext.request.contextPath}/resource.do/resource.view/" method="post">
+                                <div class="form-group">
+                                	<div class="col-sm-2">
+                                		<a href="${pageContext.request.contextPath}/standard.do/standard_add.view" class="btn btn-primary" role="button">新增</a>
+                                	</div>
+                                </div>
                             <table class="table table-striped table-bordered table-hover" id="dataTables-example">
                                 <thead>
                                 <tr>
@@ -34,6 +40,7 @@
                                         <td>${resource.name}</td>
                                         <td>${resource.permission}</td>
                                         <td>
+                                        	<a href="${pageContext.request.contextPath}/resource.do/resource_update.view?id=${resource.id}">修改</a>
                                             <a href="${pageContext.request.contextPath}/resource.do/delete?id=${resource.id}"
                                                onclick="return confirm('是否要删除该权限')">删除</a>
                                         </td>
@@ -41,9 +48,8 @@
                                 </c:forEach>
                                 </tbody>
                             </table>
-                            <a href="${pageContext.request.contextPath}/resource.do/resource_add.view" class="btn btn-primary"
-                               role="button">添加权限</a>
-                        </div>
+                           <jsp:include page="/WEB-INF/view/admin/pageSplit.jsp"></jsp:include>
+                        </form>
                         <!-- /.table-responsive -->
                     </div>
                     <!-- /.panel-body -->
diff --git a/src/main/webapp/WEB-INF/view/admin/system/resource/resource_update.jsp b/src/main/webapp/WEB-INF/view/admin/system/resource/resource_update.jsp
new file mode 100644
index 0000000..22784c3
--- /dev/null
+++ b/src/main/webapp/WEB-INF/view/admin/system/resource/resource_update.jsp
@@ -0,0 +1,51 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
+
+<!-- Page Content -->
+<div id="page-wrapper">
+    <div class="container-fluid">
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
+        <div>
+            <h1 class="page-header">权限管理</h1>
+        </div>
+        <div class="panel-heading">
+        </div>
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        权限信息
+                    </div>
+                    <!-- /.panel-heading -->
+                    <div class="panel-body">
+                        <div class="dataTable_wrapper">
+                            <form action="${pageContext.request.contextPath}/resource.do/update" method="post">
+                            	<input type="hidden" name="id" value="${resource.id }"/>
+                                <label>权限名称</label>
+                                <input class="form-control" name="name" value="${resource.name }">
+                                <label>权限</label>
+                                <input class="form-control" name="permission" value="${resource.permission }">
+
+                                <label></label>
+                                <button type="submit"
+                                        class="btn btn-primary form-control">修改
+                                </button>
+                            </form>
+                        </div>
+                        <!-- /.table-responsive -->
+                    </div>
+                    <!-- /.panel-body -->
+                </div>
+                <!-- /.panel -->
+            </div>
+            <!-- /.col-lg-12 -->
+        </div>
+    </div>
+
+    <!-- /.container-fluid -->
+</div>
+
+<jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
+
+
diff --git a/src/main/webapp/WEB-INF/view/admin/system/role/role.jsp b/src/main/webapp/WEB-INF/view/admin/system/role/role.jsp
index 5a34435..b5a0a2b 100644
--- a/src/main/webapp/WEB-INF/view/admin/system/role/role.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/system/role/role.jsp
@@ -1,7 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
-<%--<jsp:include page="/user.do/findAll"></jsp:include>--%>
 <!-- Page Content -->
 <div id="page-wrapper">
     <div class="container-fluid">
@@ -20,6 +19,13 @@
                     <!-- /.panel-heading -->
                     <div class="panel-body">
                         <div class="dataTable_wrapper">
+                        	<form class="searchForm form-horizontal" action="${pageContext.request.contextPath}/role.do/role.view/" method="post">
+                                <div class="form-group">
+                                	<div class="col-sm-2">
+                                		<a href="${pageContext.request.contextPath}/role.do/role_add.view" class="btn btn-primary"
+                               role="button">新增</a>
+                                	</div>
+                                </div>
                             <table class="table table-striped table-bordered table-hover" id="dataTables-example">
                                 <thead>
                                 <tr>
@@ -44,10 +50,10 @@
                                 </c:forEach>
                                 </tbody>
                             </table>
-                            <a href="${pageContext.request.contextPath}/role.do/role_add.view" class="btn btn-primary"
-                               role="button">添加角色</a>
-                        </div>
+                           <jsp:include page="/WEB-INF/view/admin/pageSplit.jsp"></jsp:include>
+                        </form>
                         <!-- /.table-responsive -->
+                        </div>
                     </div>
                     <!-- /.panel-body -->
                 </div>
diff --git a/src/main/webapp/WEB-INF/view/admin/system/user/user.jsp b/src/main/webapp/WEB-INF/view/admin/system/user/user.jsp
index f0944ba..a0f35db 100644
--- a/src/main/webapp/WEB-INF/view/admin/system/user/user.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/system/user/user.jsp
@@ -20,6 +20,13 @@
                     <!-- /.panel-heading -->
                     <div class="panel-body">
                         <div class="dataTable_wrapper">
+                        	<form class="searchForm form-horizontal" action="${pageContext.request.contextPath}/user.do/user.view/" method="post">
+                                <div class="form-group">
+                                	<div class="col-sm-2">
+                                		<a href="${pageContext.request.contextPath}/user.do/user_add.view" class="btn btn-primary"
+                               				role="button">新增</a>
+                                	</div>
+                                </div>
                             <table class="table table-striped table-bordered table-hover" id="dataTables-example">
                                 <thead>
                                 <tr>
@@ -34,7 +41,7 @@
                                     <tr>
                                         <td>${user.userId}</td>
                                         <td>${user.password}</td>
-                                        <td>${user.roleIdsStr}</td>
+                                        <td>${user.roleDesc}</td>
                                         <td>
                                         	<a href="${pageContext.request.contextPath}/user.do/findById?id=${user.userId}">修改</a>
                                             &nbsp;<a href="${pageContext.request.contextPath}/user.do/delete?id=${user.userId}"
@@ -44,8 +51,8 @@
                                 </c:forEach>
                                 </tbody>
                             </table>
-                            <a href="${pageContext.request.contextPath}/user.do/user_add.view" class="btn btn-primary"
-                               role="button">添加用户</a>
+                           <jsp:include page="/WEB-INF/view/admin/pageSplit.jsp"></jsp:include>
+                        </form>
                         </div>
                         <!-- /.table-responsive -->
                     </div>
diff --git a/src/main/webapp/WEB-INF/view/vm/agent/agent.jsp b/src/main/webapp/WEB-INF/view/vm/agent/agent.jsp
index 066822e..ac482d9 100644
--- a/src/main/webapp/WEB-INF/view/vm/agent/agent.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/agent/agent.jsp
@@ -1,103 +1,102 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
-<!-- Page Content -->
-<div id="page-wrapper">
-    <div class="container-fluid">
-    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
-        <div class="panel-heading">
-        </div>
-        <div class="row">
-            <div class="col-lg-12">
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        车辆信息
-                    </div>
-                    <!-- /.panel-heading -->
-                    <div class="panel-body">
-                        <div class="dataTable_wrapper">
-                        	<form class="searchForm form-horizontal" action="${pageContext.request.contextPath}/car.do/car.view/0" method="post">
-                        		<h5>查询条件</h5>
-                        		<div class="form-group">
-	                                <label class="col-sm-1 control-label">高</label>
-	                                <div class="col-sm-2">
-	                                	<input class="form-control" type="number" name="high">
-	                                </div>
-	                                <label class="col-sm-1 control-label">长</label>
-	                                <div class="col-sm-2">
-	                                	<input class="form-control" type="number" name="length">
-	                                </div>
-	                                <label class="col-sm-1 control-label">宽</label>
-	                                <div class="col-sm-2">
-	                                	<input class="form-control" type="number" name="wide">
-	                                </div>
-	                                <label class="col-sm-1 control-label">重</label>
-	                                <div class="col-sm-2">
-	                                	<input class="form-control" type="number" name="weight">
-	                                </div>
-                                </div>
-                                <div class="form-group">
-                                	<label class="col-sm-10 control-label"></label>
-                                	<div class="col-sm-1">
-                                		<button type="submit" class="btn btn-primary form-control">查询</button>
-                                	</div>
-                                	<div class="col-sm-1">
-                                		<button type="reset" class="btn btn-primary form-control">重置</button>
-                                	</div>
-                                	<div class="col-sm-1">
-                                		<a href="${pageContext.request.contextPath}/car.do/car_add.view" class="btn btn-primary" role="button">新增</a>
-                                	</div>
-                                </div>
-                        	</form>
-                            <table class="table table-striped table-bordered table-hover" id="dataTables-example">
-                                <thead>
-                                <tr>
-                                    <th>车辆编号</th>
-                                    <th>是否上架</th>
-                                    <th>高</th>
-                                    <th>长</th>
-                                    <th>宽</th>
-                                    <th>重</th>
-                                    <th>操作</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <c:forEach var="car" items="${carList}">
-                                    <tr>
-                                        <td>${car.carId}</td>
-                                        <td>
-                                        	<c:choose>
-                                        		<c:when test="${car.isSale}">上架</c:when>
-                                        		<c:otherwise>下架</c:otherwise>
-                                        	</c:choose>
-                                        </td>
-                                        <td>${car.high}</td>
-                                        <td>${car.length}</td>
-                                        <td>${car.wide}</td>
-                                        <td>${car.weight}</td>
-                                        <td>
-                                            <a href="${pageContext.request.contextPath}/car.do/car_update.view?id=${car.id}">修改</a>
-                                            <a href="${pageContext.request.contextPath}/car.do/delete?id=${car.id}"
-                                               onclick="return confirm('是否要删除该车辆')">删除</a>
-                                        </td>
-                                    </tr>
-                                </c:forEach>
-                                </tbody>
-                            </table>
-                           <jsp:include page="/WEB-INF/view/admin/pageSplit.jsp"></jsp:include>
-                        </div>
-                        <!-- /.table-responsive -->
-                    </div>
-                    <!-- /.panel-body -->
-                </div>
-                <!-- /.panel -->
-            </div>
-            <!-- /.col-lg-12 -->
-        </div>
-    </div>
-
-    <!-- /.container-fluid -->
-</div>
-
-<jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
-
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://www.springframework.org/tags/form"  prefix="form"%>
+<jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
+<!-- Page Content -->
+<div id="page-wrapper">
+    <div class="container-fluid">
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
+        <div class="panel-heading">
+        </div>
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        代理商信息
+                    </div>
+                    <!-- /.panel-heading -->
+                    <div class="panel-body">
+                        <div class="dataTable_wrapper">
+                        	<form:form cssClass="searchForm form-horizontal" commandName="agent" action="${pageContext.request.contextPath}/agent.do/agent.view/" method="post">
+                        		<button type="button" class="btn btn-default pull-right" id="toggle-advanced-search">查询条件<i class="fa fa-angle-double-down"></i></button>
+                        		<div class="clearfix"></div>
+                        		<div class="row-fluid" id="div-advanced-search" style="display:none;">
+                        		<div class="form-group">
+                        			<label class="col-sm-1 control-label">级别</label>
+	                                <div class="col-sm-2">
+	                                	<form:select path="level" cssClass="form-control">
+                                			<option></option>
+	                                		<c:forEach items="${agentLevel }" var="entry">
+	                                			<form:option value="${entry.name() }" label="${entry.getName() }"/>
+	                                		</c:forEach>
+	                                	</form:select>
+	                                </div>
+                        			<label class="col-sm-1 control-label">名称</label>
+	                                <div class="col-sm-2">
+	                                	<form:input path="agentName" cssClass="form-control"/>
+	                                </div>
+                        			<label class="col-sm-1 control-label">区域</label>
+	                                <div class="col-sm-2">
+	                                	<form:input path="area" cssClass="form-control"/>
+	                                </div>
+                        		</div>
+                                </div>
+                                <div class="form-group">
+                                	<div class="col-sm-2">
+                                		<a href="${pageContext.request.contextPath}/agent.do/agent_add.view" class="btn btn-primary" role="button">新增</a>
+                                		<button type="button" class="btn btn-primary" onclick="uploader.uploadModal('${pageContext.request.contextPath}/agent.do/import','${pageContext.request.contextPath}/template/agent_tpl.xlsx')">批量上传</button>
+                                	</div>
+                                	<label class="col-sm-8 control-label"></label>
+                                	<div id="searchBtns" style="display:none;">
+                                	<div class="col-sm-1">
+                                		<button type="button" class="btn btn-primary form-control searchBtn">查询</button>
+                                	</div>
+                                	<div class="col-sm-1">
+                                		<button type="reset" class="btn btn-primary form-control">重置</button>
+                                	</div>
+                                	</div>
+                                </div>
+                            <table class="table table-striped table-bordered table-hover" id="dataTables-example">
+                                <thead>
+                                <tr>
+                                    <th>级别</th>
+                                    <th>名称</th>
+                                    <th>绑定职员</th>
+                                    <th>区域</th>
+                                    <th>操作</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <c:forEach var="agent" items="${agentList}">
+                                    <tr>
+                                        <td>${agent.level}</td>
+                                        <td>${agent.agentName}</td>
+                                        <td>${agent.clerkIdsStr}</td>
+                                        <td>${agent.area}</td>
+                                        <td>
+                                            <a href="${pageContext.request.contextPath}/agent.do/agent_update.view?id=${agent.id}">修改</a>
+                                            <a href="${pageContext.request.contextPath}/agent.do/delete?id=${agent.id}"
+                                               onclick="return confirm('是否要删除该代理商')">删除</a>
+                                        </td>
+                                    </tr>
+                                </c:forEach>
+                                </tbody>
+                            </table>
+                           <jsp:include page="/WEB-INF/view/admin/pageSplit.jsp"></jsp:include>
+                        </form:form>
+                        </div>
+                        <!-- /.table-responsive -->
+                    </div>
+                    <!-- /.panel-body -->
+                </div>
+                <!-- /.panel -->
+            </div>
+            <!-- /.col-lg-12 -->
+        </div>
+    </div>
+
+    <!-- /.container-fluid -->
+</div>
+
+<jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
+
diff --git a/src/main/webapp/WEB-INF/view/vm/agent/agent_add.jsp b/src/main/webapp/WEB-INF/view/vm/agent/agent_add.jsp
index 40e2f4b..4283f76 100644
--- a/src/main/webapp/WEB-INF/view/vm/agent/agent_add.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/agent/agent_add.jsp
@@ -6,7 +6,7 @@
     <div class="container-fluid">
     	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
         <div>
-            <h1 class="page-header">车辆管理</h1>
+            <h1 class="page-header">代理商管理</h1>
         </div>
         <div class="panel-heading">
         </div>
@@ -14,18 +14,18 @@
             <div class="col-lg-12">
                 <div class="panel panel-default">
                     <div class="panel-heading">
-                        车辆管理
+                        代理商管理
                     </div>
                     <!-- /.panel-heading -->
                     <div class="panel-body">
                         <div class="dataTable_wrapper">
-                            <form class="form-horizontal" action="${pageContext.request.contextPath}/car.do/add" method="post">
+                            <form class="form-horizontal" action="${pageContext.request.contextPath}/agent.do/add" method="post">
                             	<div class="form-group">
 	                                <label class="col-sm-1 control-label">编号</label>
 	                                <div class="col-sm-11">
-	                                	<select class="selectpicker form-control" name="carId">
+	                                	<select class="selectpicker form-control" name="agentId">
 	                                		<c:forEach items="${standardList }" var="standard">
-	                                			<option value="${standard.carId }">${standard.carId }</option>
+	                                			<option value="${standard.agentId }">${standard.agentId }</option>
 	                                		</c:forEach>
 	                                	</select>
 	                                </div>
diff --git a/src/main/webapp/WEB-INF/view/vm/agent/agent_update.jsp b/src/main/webapp/WEB-INF/view/vm/agent/agent_update.jsp
index 3beaf10..22c0bec 100644
--- a/src/main/webapp/WEB-INF/view/vm/agent/agent_update.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/agent/agent_update.jsp
@@ -7,7 +7,7 @@
     <div class="container-fluid">
     	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
         <div>
-            <h1 class="page-header">车辆管理</h1>
+            <h1 class="page-header">代理商管理</h1>
         </div>
         <div class="panel-heading">
         </div>
@@ -15,19 +15,19 @@
             <div class="col-lg-12">
                 <div class="panel panel-default">
                     <div class="panel-heading">
-                        车辆信息
+                        代理商信息
                     </div>
                     <!-- /.panel-heading -->
                     <div class="panel-body">
                         <div class="dataTable_wrapper">
-                            <form class="form-horizontal" action="${pageContext.request.contextPath}/car.do/update" method="post">
-                                <input name="id" type="hidden" value="${car.id }">
+                            <form class="form-horizontal" action="${pageContext.request.contextPath}/agent.do/update" method="post">
+                                <input name="id" type="hidden" value="${agent.id }">
                                 <div class="form-group">
                                 	<label class="col-sm-1 control-label">编号</label>
                                 	<div class="col-sm-11">
-                                		<select class="selectpicker form-control" name="carId">
+                                		<select class="selectpicker form-control" name="agentId">
 	                                		<c:forEach items="${standardList }" var="standard">
-	                                			<option <c:if test="${car.carId==standard.carId }">selected</c:if> value="${standard.carId }">${standard.carId }</option>
+	                                			<option <c:if test="${agent.agentId==standard.agentId }">selected</c:if> value="${standard.agentId }">${standard.agentId }</option>
 	                                		</c:forEach>
 	                                	</select>
                                 	</div>
@@ -36,33 +36,33 @@
 	                                <label class="col-sm-1 control-label">是否上架</label>
 	                                <div class="col-sm-11">
 		                                <select class="selectpicker form-control" name="isSale">
-		                                	<option value="true" <c:if test="${car.isSale }">selected</c:if>>上架</option>
-		                                	<option value="false" <c:if test="${not car.isSale }">selected</c:if>>下架</option>
+		                                	<option value="true" <c:if test="${agent.isSale }">selected</c:if>>上架</option>
+		                                	<option value="false" <c:if test="${not agent.isSale }">selected</c:if>>下架</option>
 		                                </select>
 	                                </div>
 	                            </div>
 	                            <div class="form-group">
 	                                <label class="col-sm-1 control-label">高</label>
 	                                <div class="col-sm-11">
-	                                	<input class="form-control" type="number" name="high" value="${car.high }">
+	                                	<input class="form-control" type="number" name="high" value="${agent.high }">
 	                                </div>
                                 </div>
                                 <div class="form-group">
 	                                <label class="col-sm-1 control-label">长</label>
 	                                <div class="col-sm-11">
-	                                	<input class="form-control" type="number" name="length" value="${car.length }">
+	                                	<input class="form-control" type="number" name="length" value="${agent.length }">
 	                                </div>
                                 </div>
                                 <div class="form-group">
 	                                <label class="col-sm-1 control-label">宽</label>
 	                                <div class="col-sm-11">
-	                                	<input class="form-control" type="number" name="wide" value="${car.wide }">
+	                                	<input class="form-control" type="number" name="wide" value="${agent.wide }">
 	                                </div>
                                 </div>
                                 <div class="form-group">
 	                                <label class="col-sm-1 control-label">重量</label>
 	                                <div class="col-sm-11">
-	                                	<input class="form-control" type="number" name="weight" value="${car.weight }">
+	                                	<input class="form-control" type="number" name="weight" value="${agent.weight }">
 	                                </div>
                                 </div>
                                 <label class="col-sm-2 control-label"></label>
diff --git a/src/main/webapp/WEB-INF/view/vm/car/car.jsp b/src/main/webapp/WEB-INF/view/vm/car/car.jsp
index bc50761..a091b88 100644
--- a/src/main/webapp/WEB-INF/view/vm/car/car.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/car/car.jsp
@@ -38,19 +38,19 @@
                         		<div class="form-group">
 	                                <label class="col-sm-1 control-label">高</label>
 	                                <div class="col-sm-2">
-	                                	<input class="form-control" type="number" name="high" value="">
+	                                	<input class="form-control" type="number" name="high" value="${car.high }">
 	                                </div>
 	                                <label class="col-sm-1 control-label">长</label>
 	                                <div class="col-sm-2">
-	                                	<input class="form-control" type="number" name="length">
+	                                	<input class="form-control" type="number" name="length" value="${car.length }">
 	                                </div>
 	                                <label class="col-sm-1 control-label">宽</label>
 	                                <div class="col-sm-2">
-	                                	<input class="form-control" type="number" name="wide">
+	                                	<input class="form-control" type="number" name="wide" value="${car.wide }">
 	                                </div>
 	                                <label class="col-sm-1 control-label">重</label>
 	                                <div class="col-sm-2">
-	                                	<input class="form-control" type="number" name="weight">
+	                                	<input class="form-control" type="number" name="weight" value="${car.weight }">
 	                                </div>
                                 </div>
                                 </div>

From 89a90100b686f142e618d96837a9fe8d96dfde19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=8D=8E=E6=88=90?= <duhuacheng.ver@gmail.com>
Date: Thu, 16 Mar 2017 15:03:32 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E5=A2=9E=E5=8A=A0username,=E4=BB=A3?=
 =?UTF-8?q?=E7=90=86=E5=95=86=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/entity/Agent.java           |  40 +++--
 src/main/java/com/entity/User.java            |  17 +-
 src/main/java/com/realm/UserRealm.java        |  12 +-
 src/main/java/com/system/dao/UserDao.java     |   2 +-
 src/main/java/com/system/service/UserBiz.java |   4 +-
 .../com/system/service/impl/UserBizImpl.java  |  18 +-
 src/main/java/com/util/PasswordHelper.java    |   9 +
 src/main/java/com/util/TaskJob.java           |  15 --
 src/main/java/com/util/Term.java              |  26 ---
 src/main/java/com/util/TermContainer.java     |  83 ----------
 .../com/vm/controller/AgentController.java    |  28 ++++
 src/main/resources/log4j.properties           |   2 +-
 src/main/resources/mapper/AgentDao.xml        |   8 +-
 src/main/resources/mapper/UserDao.xml         |  13 +-
 src/main/resources/spring-mvc.xml             |  31 +---
 .../WEB-INF/view/admin/system/user/user.jsp   |   2 +
 .../view/admin/system/user/user_add.jsp       |   4 +-
 .../view/admin/system/user/user_update.jsp    |   5 +-
 .../webapp/WEB-INF/view/vm/agent/agent.jsp    |   8 +-
 .../WEB-INF/view/vm/agent/agent_add.jsp       |  42 ++---
 .../WEB-INF/view/vm/agent/agent_update.jsp    | 156 ++++++++----------
 target/classes/log4j.properties               |   2 +-
 22 files changed, 204 insertions(+), 323 deletions(-)
 delete mode 100644 src/main/java/com/util/TaskJob.java
 delete mode 100644 src/main/java/com/util/Term.java
 delete mode 100644 src/main/java/com/util/TermContainer.java

diff --git a/src/main/java/com/entity/Agent.java b/src/main/java/com/entity/Agent.java
index 48e04d4..3c2b34a 100644
--- a/src/main/java/com/entity/Agent.java
+++ b/src/main/java/com/entity/Agent.java
@@ -1,10 +1,8 @@
 package com.entity;
 
 import java.io.Serializable;
-import java.util.Arrays;
 import java.util.List;
 
-import org.apache.commons.collections.ListUtils;
 import org.apache.commons.lang.StringUtils;
 
 import com.entity.enumeration.AgentLevel;
@@ -15,20 +13,20 @@ public class Agent implements Serializable{
 	private Long id;
     private AgentLevel level;
     private String agentName;
-    private List<Long> clerkIds;
-    private String clerkIdsStr;
+    private List<String> userIds;
+    private String userIdsStr;
     private String area;
 	
 	public Agent() {
 		super();
 	}
 
-	public Agent(AgentLevel level, String agentName, String clerkIdsStr,
+	public Agent(AgentLevel level, String agentName, String userIdsStr,
 			String area) {
 		super();
 		this.level = level;
 		this.agentName = agentName;
-		this.setClerkIdsStr(clerkIdsStr);
+		this.setUserIdsStr(userIdsStr);
 		this.area = area;
 	}
 
@@ -56,30 +54,30 @@ public void setAgentName(String agentName) {
 		this.agentName = agentName;
 	}
 
-	public List<Long> getClerkIds() {
-		return clerkIds;
+	public List<String> getUserIds() {
+		return userIds;
 	}
 
-	public void setClerkIds(List<Long> clerkIds) {
-		this.clerkIds = clerkIds;
+	public void setUserIds(List<String> userIds) {
+		this.userIds = userIds;
 		StringBuffer buff = new StringBuffer();
-		for(Long id : clerkIds) {
+		for(String id : userIds) {
 			buff.append(id).append(',');
 		}
-		this.clerkIdsStr = buff.toString();
+		this.userIdsStr = buff.toString();
 	}
 
-	public String getClerkIdsStr() {
-		return clerkIdsStr;
+	public String getUserIdsStr() {
+		return userIdsStr;
 	}
 
-	public void setClerkIdsStr(String clerkIdsStr) {
-		this.clerkIdsStr = clerkIdsStr;
-		if(!StringUtils.isEmpty(clerkIdsStr)) {
-			this.clerkIds = Lists.newArrayList();
-			String[] ids = clerkIdsStr.split(",");
+	public void setUserIdsStr(String userIdsStr) {
+		this.userIdsStr = userIdsStr;
+		if(!StringUtils.isEmpty(userIdsStr)) {
+			this.userIds = Lists.newArrayList();
+			String[] ids = userIdsStr.split(",");
 			for(String id : ids) {
-				this.clerkIds.add(Long.parseLong(id));
+				this.userIds.add(id);
 			}
 		}
 	}
@@ -95,6 +93,6 @@ public void setArea(String area) {
 	@Override
 	public String toString() {
 		return "Agent [id=" + id + ", level=" + level + ", agentName="
-				+ agentName + ", clerdIds=" + clerkIds + ", area=" + area + "]";
+				+ agentName + ", userIds=" + userIds + ", area=" + area + "]";
 	}
 }
diff --git a/src/main/java/com/entity/User.java b/src/main/java/com/entity/User.java
index 813a46a..4092a5b 100644
--- a/src/main/java/com/entity/User.java
+++ b/src/main/java/com/entity/User.java
@@ -1,17 +1,13 @@
 package com.entity;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import org.hibernate.validator.constraints.NotBlank;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
-/**
- * Created by c0de8ug on 16-2-9.
- */
 public class User {
-	
     String username; //用户名
     @NotBlank
     String userId;
@@ -91,7 +87,7 @@ public void setSalt(String salt) {
     }
 
     public String getCredentialsSalt() {
-        return username + salt;
+        return userId + salt;
     }
 
 	public String[] getPasswords() {
@@ -120,4 +116,13 @@ public void setRoleIdsStr(String roleIdsStr) {
             roleIds.add(Long.valueOf(roleIdStr));
         }
     }
+
+	@Override
+	public String toString() {
+		return "User [username=" + username + ", userId=" + userId
+				+ ", password=" + password + ", passwords="
+				+ Arrays.toString(passwords) + ", salt=" + salt + ", roleIds="
+				+ roleIds + ", roleIdsStr=" + roleIdsStr + ", roleDesc="
+				+ roleDesc + ", locked=" + locked + "]";
+	}
 }
diff --git a/src/main/java/com/realm/UserRealm.java b/src/main/java/com/realm/UserRealm.java
index 27e724f..896e6a0 100644
--- a/src/main/java/com/realm/UserRealm.java
+++ b/src/main/java/com/realm/UserRealm.java
@@ -37,11 +37,11 @@ public class UserRealm extends AuthorizingRealm {
 
     @Override
     protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
-        String username = (String)principals.getPrimaryPrincipal();
+        String userid = (String)principals.getPrimaryPrincipal();
 
         SimpleAuthorizationInfo authorizationInfo = new SimpleAuthorizationInfo();
-        authorizationInfo.setRoles(userBiz.findRoles(username));
-        if("admin".equals(username)) {
+        authorizationInfo.setRoles(userBiz.findRoles(userid));
+        if("admin".equals(userid)) {
         	List<Resource> list = resourceBiz.findAll();
         	Set<String> set = Sets.newHashSet();
         	for(Resource r : list) {
@@ -49,7 +49,7 @@ protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principal
         	}
         	authorizationInfo.setStringPermissions(set);
         } else {
-        	authorizationInfo.setStringPermissions(userBiz.findPermissions(username));
+        	authorizationInfo.setStringPermissions(userBiz.findPermissions(userid));
         }
         return authorizationInfo;
     }
@@ -57,9 +57,9 @@ protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principal
     @Override
     protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authcToken) throws AuthenticationException {
     	UsernamePasswordToken token = (UsernamePasswordToken) authcToken;  
-        String username = token.getUsername();
+        String userid = token.getUsername();
 
-        User user = userBiz.findByUsername(username);
+        User user = userBiz.findById(userid);
 
         if(user == null) {
             throw new UnknownAccountException();//没找到帐号
diff --git a/src/main/java/com/system/dao/UserDao.java b/src/main/java/com/system/dao/UserDao.java
index c8fbc04..e4e6c96 100644
--- a/src/main/java/com/system/dao/UserDao.java
+++ b/src/main/java/com/system/dao/UserDao.java
@@ -24,5 +24,5 @@ public interface UserDao {
 
     public void updatePassword(@Param("userId") String id, @Param("password") String password);
 
-    User findByUsername(String username);
+	public List<User> findByRole(String role);
 }
diff --git a/src/main/java/com/system/service/UserBiz.java b/src/main/java/com/system/service/UserBiz.java
index 176a9a4..a498b52 100644
--- a/src/main/java/com/system/service/UserBiz.java
+++ b/src/main/java/com/system/service/UserBiz.java
@@ -24,9 +24,9 @@ public interface UserBiz {
     public void changePassword(String userId, String newPassword);
 
 
-    public User findByUsername(String username);
-
     public Set<String> findRoles(String username);
 
     public Set<String> findPermissions(String username);
+
+	public List<User> findByRole(String string);
 }
diff --git a/src/main/java/com/system/service/impl/UserBizImpl.java b/src/main/java/com/system/service/impl/UserBizImpl.java
index 14d0f8f..95fb9e6 100644
--- a/src/main/java/com/system/service/impl/UserBizImpl.java
+++ b/src/main/java/com/system/service/impl/UserBizImpl.java
@@ -64,6 +64,11 @@ public List<User> findAll() throws InvocationTargetException, IllegalAccessExcep
     }
 
     @Override
+	public List<User> findByRole(String role) {
+    	return userDao.findByRole(role);
+	}
+
+	@Override
     public User findById(String id) {
         return userDao.findById(id);
     }
@@ -98,13 +103,8 @@ public void changePassword(String userId, String newPassword) {
     }
 
     @Override
-    public User findByUsername(String username) {
-        return userDao.findById(username);
-    }
-
-    @Override
-    public Set<String> findRoles(String username) {
-        User user = findByUsername(username);
+    public Set<String> findRoles(String userid) {
+        User user = findById(userid);
         if (user == null) {
             return Collections.emptySet();
         }
@@ -112,8 +112,8 @@ public Set<String> findRoles(String username) {
     }
 
     @Override
-    public Set<String> findPermissions(String username) {
-        User user = findByUsername(username);
+    public Set<String> findPermissions(String userid) {
+        User user = findById(userid);
         if (user == null) {
             return Collections.emptySet();
         }
diff --git a/src/main/java/com/util/PasswordHelper.java b/src/main/java/com/util/PasswordHelper.java
index b3da71b..06c41c4 100644
--- a/src/main/java/com/util/PasswordHelper.java
+++ b/src/main/java/com/util/PasswordHelper.java
@@ -32,6 +32,15 @@ public void setAlgorithmName(String algorithmName) {
     public void setHashIterations(int hashIterations) {
         this.hashIterations = hashIterations;
     }
+    
+    public static void main(String[] args) {
+    	PasswordHelper ph = new PasswordHelper();
+    	User user = new User();
+    	user.setUserId("admin");
+    	user.setPassword("123456");
+    	ph.encryptPassword(user);
+    	System.out.println(user);
+	}
 
     public void encryptPassword(User user) {
 
diff --git a/src/main/java/com/util/TaskJob.java b/src/main/java/com/util/TaskJob.java
deleted file mode 100644
index f9612be..0000000
--- a/src/main/java/com/util/TaskJob.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.util;
-
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-/**
- * Created by c0de8ug on 16-2-15.
- */
-//@Component
-public class TaskJob {
-    //@Scheduled(cron = "0 0 0 1 * ?")
-    public void job() {
-        TermContainer.update();
-    }
-}
diff --git a/src/main/java/com/util/Term.java b/src/main/java/com/util/Term.java
deleted file mode 100644
index 9d24fea..0000000
--- a/src/main/java/com/util/Term.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.util;
-
-
-/**
- * Created by c0de8ug on 16-2-15.
- */
-public class Term {
-    String val;
-    String text;
-
-    public String getVal() {
-        return val;
-    }
-
-    public void setVal(String val) {
-        this.val = val;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-}
diff --git a/src/main/java/com/util/TermContainer.java b/src/main/java/com/util/TermContainer.java
deleted file mode 100644
index 2b8ca70..0000000
--- a/src/main/java/com/util/TermContainer.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.util;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.List;
-
-import org.springframework.stereotype.Component;
-
-/**
- * Created by c0de8ug on 16-2-15.
- */
-@Component
-public class TermContainer {
-    static List<Term> termList;
-    static Date beginTime;
-    static HashMap<String, String> map = new HashMap<>();
-    final static String lastTermStr = "上学期";
-    final static String nextTermStr = "下学期";
-
-    String lastSemester = "2,3,4,5,6,7,8";
-    String nextSemester = "1,9,10,11,12";
-
-    TermContainer() {
-
-
-        for (String temp : lastSemester.split(",")) {
-            map.put(temp, lastTermStr);
-        }
-        for (String temp : nextSemester.split(",")) {
-            map.put(temp, nextTermStr);
-        }
-        beginTime = new GregorianCalendar(2014,1,1).getTime();
-        update();
-    }
-
-    public static void update() {
-        termList = new ArrayList<>();
-
-        Date today = new Date();
-
-
-        int beginYear = beginTime.getYear();
-        int todayYear = today.getYear();
-        int count = todayYear - beginYear;
-
-        if (map.get(String.valueOf(today.getMonth())).equals(nextTermStr)) {
-            Term term = new Term();
-            term.setVal(todayYear + "2");
-            term.setText(todayYear + nextTermStr);
-            termList.add(term);
-        }
-        Term term = new Term();
-        term.setVal(todayYear + "1");
-        term.setText(todayYear + lastTermStr);
-        termList.add(term);
-
-
-        for (int i = 0; i < count; i++) {
-            todayYear--;
-            term = new Term();
-            term.setVal(todayYear + "2");
-            term.setText(todayYear + nextTermStr);
-            termList.add(term);
-            term = new Term();
-            term.setVal(todayYear + "1");
-            term.setText(todayYear + lastTermStr);
-            termList.add(term);
-
-        }
-
-    }
-
-
-    public static String now() {
-        return termList.get(0).getVal();
-    }
-
-    public static List<Term> getTermList() {
-        return termList;
-    }
-}
diff --git a/src/main/java/com/vm/controller/AgentController.java b/src/main/java/com/vm/controller/AgentController.java
index d5a4390..e8e62b2 100644
--- a/src/main/java/com/vm/controller/AgentController.java
+++ b/src/main/java/com/vm/controller/AgentController.java
@@ -1,12 +1,18 @@
 package com.vm.controller;
 
+import java.beans.PropertyEditorSupport;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 import org.apache.log4j.Logger;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -14,6 +20,7 @@
 import com.entity.enumeration.AgentLevel;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.system.service.UserBiz;
 import com.vm.service.AgentBiz;
 
 @Controller
@@ -23,6 +30,23 @@ public class AgentController {
 
     @Autowired
     private AgentBiz agentBiz;
+    @Autowired
+    private UserBiz userBiz;
+    
+    @InitBinder    
+    protected void initBinder(WebDataBinder binder) {
+    	binder.registerCustomEditor(AgentLevel.class, new PropertyEditorSupport(){
+    		@Override  
+		    public void setAsText(String text) throws IllegalArgumentException {  
+		        this.setValue(AgentLevel.valueOf(text));  
+		    }  
+		    @Override  
+		    public String getAsText() {  
+		    	AgentLevel value = (AgentLevel)this.getValue();  
+		        return value.name();  
+		    }  
+    	});
+    }
     
     @RequiresPermissions("agent:query")
     @RequestMapping("agent.view")
@@ -46,12 +70,16 @@ public String agentView(Agent agent,Model m,@PathVariable("pageNum") int pageNum
     @RequiresPermissions("agent:add")
     @RequestMapping("agent_add.view")
     public String agentAddView(Model m) {
+    	m.addAttribute("agent", new Agent());
+    	m.addAttribute("agentLevel", AgentLevel.values());
+    	m.addAttribute("userList", userBiz.findByRole("agent"));
         return "/vm/agent/agent_add";
     }
 
     @RequiresPermissions("agent:update")
     @RequestMapping("agent_update.view")
     public String agentUpdateView(Long id,Model m) {
+    	m.addAttribute("agentLevel", AgentLevel.values());
     	m.addAttribute("agent",agentBiz.findById(id));
         return "/vm/agent/agent_update";
     }
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
index 370bc49..ff1028a 100644
--- a/src/main/resources/log4j.properties
+++ b/src/main/resources/log4j.properties
@@ -1,4 +1,4 @@
-log4j.rootLogger = info , stdout
+log4j.rootLogger = debug , stdout
 
 ###  output to the console ###
 log4j.appender.stdout = org.apache.log4j.ConsoleAppender
diff --git a/src/main/resources/mapper/AgentDao.xml b/src/main/resources/mapper/AgentDao.xml
index a1a9bdb..f1b5e0f 100644
--- a/src/main/resources/mapper/AgentDao.xml
+++ b/src/main/resources/mapper/AgentDao.xml
@@ -10,7 +10,7 @@
         <id property="id" column="id"/>
         <result property="level" column="level"/>
         <result property="agentName" column="agent_name"/>
-        <result property="clerkId" column="clerk_id"/>
+        <result property="userIdsStr" column="user_ids"/>
         <result property="area" column="area"/>
     </resultMap>
 
@@ -46,15 +46,15 @@
         	<if test="area != null and area!=''">
         		area=#{area},
         	</if>
-        	<if test="clerkId != null">
-        		clerk_id=#{clerkId},
+        	<if test="userIdsStr != null and userIdsStr != ''">
+        		user_ids=#{clerkIdStr},
         	</if>
         </set>
         WHERE id = #{id}
     </update>
 
     <insert id="add" parameterType="Agent">
-        INSERT INTO agent(level,agent_name,clerk_id,area) VALUES(#{level},#{agentName},#{clerkId},#{area})
+        INSERT INTO agent(level,agent_name,user_ids,area) VALUES(#{level},#{agentName},#{userIdsStr},#{area})
     </insert>
 
     <delete id="delete" parameterType="long">
diff --git a/src/main/resources/mapper/UserDao.xml b/src/main/resources/mapper/UserDao.xml
index 5ef1aac..1600d3c 100644
--- a/src/main/resources/mapper/UserDao.xml
+++ b/src/main/resources/mapper/UserDao.xml
@@ -8,6 +8,7 @@
 
     <resultMap id="user_map" type="User">
         <id property="userId" column="user_id"/>
+        <result property="username" column="username"/>
         <result property="password" column="password"/>
         <result property="salt" column="salt"/>
         <result property="roleIdsStr" column="role_ids"/>
@@ -16,6 +17,11 @@
     <select id="findAll" resultMap="user_map">
         SELECT * FROM user WHERE user_id != 'admin'
     </select>
+    <select id="findByRole" resultMap="user_map" parameterType="string">
+        SELECT u.user_id,u.username FROM user u,role r 
+        WHERE find_in_set(r.id,u.role_ids)
+        AND r.role=#{role}
+    </select>
 
     <select id="findById" parameterType="String" resultMap="user_map">
         SELECT * FROM user WHERE user_id = #{value}
@@ -24,6 +30,9 @@
     <update id="update" parameterType="User">
         UPDATE user 
         <set>
+        	<if test="username!=null and username!=''">
+        		password = #{password},
+        	</if>
         	<if test="password!=null and password!=''">
         		password = #{password},
         	</if>
@@ -39,7 +48,7 @@
     </update>
 
     <insert id="add" parameterType="User">
-        INSERT INTO user(user_id,password,salt,role_ids,locked) VALUES(#{userId},#{password},#{salt},#{roleIdsStr},#{locked})
+        INSERT INTO user(user_id,username,password,salt,role_ids,locked) VALUES(#{userId},#{username},#{password},#{salt},#{roleIdsStr},#{locked})
     </insert>
 
     <select id="findByIdAndPassword" parameterType="map" resultMap="user_map">
@@ -49,6 +58,4 @@
     <delete id="delete" parameterType="String">
         DELETE FROM user WHERE user_id = #{value}
     </delete>
-
-
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/spring-mvc.xml b/src/main/resources/spring-mvc.xml
index df59dd6..8aea47e 100644
--- a/src/main/resources/spring-mvc.xml
+++ b/src/main/resources/spring-mvc.xml
@@ -26,7 +26,13 @@
 
     <!--用于解析@RequestBody-->
     <bean id="conversionService"
-          class="org.springframework.format.support.FormattingConversionServiceFactoryBean"></bean>
+          class="org.springframework.format.support.FormattingConversionServiceFactoryBean">
+    	<!-- <property name="converters">
+	      <set>
+	        <bean class="cn.sh.ideal.task.manager.convert.StringToEnumDynamicHandleTypeConverter"/>
+	      </set>
+    	</property> -->
+    </bean>
 
     <!--视图解析器-->
     <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
@@ -49,29 +55,6 @@
             </bean>
         </mvc:message-converters>
     </mvc:annotation-driven>
-    <!-- <bean class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping" />
-    <bean class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter">
-       <property name="messageConverters">
-           <list>
-               <bean class="org.springframework.http.converter.StringHttpMessageConverter">
-                   <property name="supportedMediaTypes">
-                       <list>
-                           <value>text/html; charset=UTF-8</value>
-                           <value>application/json;charset=UTF-8</value>
-                       </list>
-                   </property>
-               </bean>
-               <bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
-                   <property name="supportedMediaTypes">
-                       <list>
-                           <value>text/html; charset=UTF-8</value>
-                           <value>application/json;charset=UTF-8</value>
-                       </list>
-                   </property>
-               </bean>
-           </list>
-       </property>
-  	</bean> -->
 
     <!--多部分解析器,用于解析文件上传时context-type为-->
     <!--Content-Type:multipart/form-data; boundary=...的情况-->
diff --git a/src/main/webapp/WEB-INF/view/admin/system/user/user.jsp b/src/main/webapp/WEB-INF/view/admin/system/user/user.jsp
index a0f35db..1c7c440 100644
--- a/src/main/webapp/WEB-INF/view/admin/system/user/user.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/system/user/user.jsp
@@ -30,6 +30,7 @@
                             <table class="table table-striped table-bordered table-hover" id="dataTables-example">
                                 <thead>
                                 <tr>
+                                    <th>登录名</th>
                                     <th>用户名</th>
                                     <th>密码</th>
                                     <th>权限</th>
@@ -40,6 +41,7 @@
                                 <c:forEach var="user" items="${userList}">
                                     <tr>
                                         <td>${user.userId}</td>
+                                        <td>${user.username}</td>
                                         <td>${user.password}</td>
                                         <td>${user.roleDesc}</td>
                                         <td>
diff --git a/src/main/webapp/WEB-INF/view/admin/system/user/user_add.jsp b/src/main/webapp/WEB-INF/view/admin/system/user/user_add.jsp
index 7422a6a..81d482c 100644
--- a/src/main/webapp/WEB-INF/view/admin/system/user/user_add.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/system/user/user_add.jsp
@@ -21,8 +21,10 @@
                     <div class="panel-body">
                         <div class="dataTable_wrapper">
                             <form action="${pageContext.request.contextPath}/user.do/add" method="post">
-                                <label>用户名</label>
+                                <label>登录名</label>
                                 <input class="form-control" name="userId">
+                                <label>用户名</label>
+                                <input class="form-control" name="username">
                                 <label>密码</label>
                                 <input multiple class="selectpicker form-control" name="password" type="password">
                                 <label>角色列表</label>
diff --git a/src/main/webapp/WEB-INF/view/admin/system/user/user_update.jsp b/src/main/webapp/WEB-INF/view/admin/system/user/user_update.jsp
index 0b419c5..ca42f70 100644
--- a/src/main/webapp/WEB-INF/view/admin/system/user/user_update.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/system/user/user_update.jsp
@@ -22,9 +22,10 @@
                     <div class="panel-body">
                         <div class="dataTable_wrapper">
                             <form action="${pageContext.request.contextPath}/user.do/update" method="post">
-                                <label name="id">用户名：${user.userId}</label>
+                                <label name="id">登录名：${user.userId}</label>
                                 <input type="hidden" name="userId" value="${user.userId}">
-                                <p></p>
+                                <label>用户名</label>
+                                <input class="form-control" name="username"value="${user.username }">
                                 <label>新密码</label>
                                 <input class="form-control" name="password" type="password">
                                 <input name="salt" type="hidden" value="${user.salt} ">
diff --git a/src/main/webapp/WEB-INF/view/vm/agent/agent.jsp b/src/main/webapp/WEB-INF/view/vm/agent/agent.jsp
index ac482d9..f246ca6 100644
--- a/src/main/webapp/WEB-INF/view/vm/agent/agent.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/agent/agent.jsp
@@ -24,12 +24,12 @@
                         		<div class="form-group">
                         			<label class="col-sm-1 control-label">级别</label>
 	                                <div class="col-sm-2">
-	                                	<form:select path="level" cssClass="form-control">
+	                                	<select name="level" class="form-control">
                                 			<option></option>
 	                                		<c:forEach items="${agentLevel }" var="entry">
-	                                			<form:option value="${entry.name() }" label="${entry.getName() }"/>
+	                                			<option value="${entry.name() }" <c:if test="${agent.level==entry }">selected</c:if>>${entry.getName() }</option>
 	                                		</c:forEach>
-	                                	</form:select>
+	                                	</select>
 	                                </div>
                         			<label class="col-sm-1 control-label">名称</label>
 	                                <div class="col-sm-2">
@@ -71,7 +71,7 @@
                                     <tr>
                                         <td>${agent.level}</td>
                                         <td>${agent.agentName}</td>
-                                        <td>${agent.clerkIdsStr}</td>
+                                        <td>${agent.userIdsStr}</td>
                                         <td>${agent.area}</td>
                                         <td>
                                             <a href="${pageContext.request.contextPath}/agent.do/agent_update.view?id=${agent.id}">修改</a>
diff --git a/src/main/webapp/WEB-INF/view/vm/agent/agent_add.jsp b/src/main/webapp/WEB-INF/view/vm/agent/agent_add.jsp
index 4283f76..213dc27 100644
--- a/src/main/webapp/WEB-INF/view/vm/agent/agent_add.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/agent/agent_add.jsp
@@ -1,5 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
 <jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
 <!-- Page Content -->
 <div id="page-wrapper">
@@ -19,55 +20,41 @@
                     <!-- /.panel-heading -->
                     <div class="panel-body">
                         <div class="dataTable_wrapper">
-                            <form class="form-horizontal" action="${pageContext.request.contextPath}/agent.do/add" method="post">
+                            <form:form action="${pageContext.request.contextPath}/agent.do/add" commandName="agent" method="post" cssClass="form-horizontal">
                             	<div class="form-group">
-	                                <label class="col-sm-1 control-label">编号</label>
+	                                <label class="col-sm-1 control-label">代理商级别</label>
 	                                <div class="col-sm-11">
-	                                	<select class="selectpicker form-control" name="agentId">
-	                                		<c:forEach items="${standardList }" var="standard">
-	                                			<option value="${standard.agentId }">${standard.agentId }</option>
+	                                	<select name="level" class="selectpicker form-control">
+                                			<option></option>
+	                                		<c:forEach items="${agentLevel }" var="entry">
+	                                			<option value="${entry.name() }" <c:if test="${agent.level==entry }">selected</c:if>>${entry.getName() }</option>
 	                                		</c:forEach>
 	                                	</select>
 	                                </div>
                                 </div>
                                 <div class="form-group">
-	                                <label class="col-sm-1 control-label">是否上架</label>
+	                                <label class="col-sm-1 control-label">代理商名称</label>
 	                                <div class="col-sm-11">
-		                                <select class="selectpicker form-control" name="isSale">
-		                                	<option value="true">上架</option>
-		                                	<option value="false">下架</option>
-		                                </select>
+	                                	<form:input path="agentName" cssClass="form-control"/>
 		                             </div>
                                 </div>
                                 <div class="form-group">
-	                                <label class="col-sm-1 control-label">高</label>
+	                                <label class="col-sm-1 control-label">绑定员工</label>
 	                                <div class="col-sm-11">
-	                                	<input class="form-control" type="number" name="high">
+	                                	<form:select path="userIds" items="${userList }" itemValue="userId" itemLabel="username" cssClass="selectpicker form-control" multiple="multiple"/>
 	                                </div>
                                 </div>
                                 <div class="form-group">
-	                                <label class="col-sm-1 control-label">长</label>
+	                                <label class="col-sm-1 control-label">区域</label>
 	                                <div class="col-sm-11">
-	                                	<input class="form-control" type="number" name="length">
+	                                	<form:input path="area" cssClass="form-control"/>
 	                                </div>
                                 </div>
-                                <div class="form-group">
-	                                <label class="col-sm-1 control-label">宽</label>
-	                                <div class="col-sm-11">
-	                                	<input class="form-control" type="number" name="wide">
-	                                </div>
-                                </div>
-                                <div class="form-group">
-	                                <label class="col-sm-1 control-label">重量</label>
-	                                <div class="col-sm-11">
-	                               		<input class="form-control" type="number" name="weight">
-	                               	</div>
-                                </div>
                                 <label></label>
                                 <button type="submit"
                                         class="btn btn-primary form-control">添加
                                 </button>
-                            </form>
+                            </form:form>
                         </div>
                         <!-- /.table-responsive -->
                     </div>
@@ -78,7 +65,6 @@
             <!-- /.col-lg-12 -->
         </div>
     </div>
-
     <!-- /.container-fluid -->
 </div>
 <jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
diff --git a/src/main/webapp/WEB-INF/view/vm/agent/agent_update.jsp b/src/main/webapp/WEB-INF/view/vm/agent/agent_update.jsp
index 22c0bec..4929c64 100644
--- a/src/main/webapp/WEB-INF/view/vm/agent/agent_update.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/agent/agent_update.jsp
@@ -1,86 +1,70 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
-
-<!-- Page Content -->
-<div id="page-wrapper">
-    <div class="container-fluid">
-    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
-        <div>
-            <h1 class="page-header">代理商管理</h1>
-        </div>
-        <div class="panel-heading">
-        </div>
-        <div class="row">
-            <div class="col-lg-12">
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        代理商信息
-                    </div>
-                    <!-- /.panel-heading -->
-                    <div class="panel-body">
-                        <div class="dataTable_wrapper">
-                            <form class="form-horizontal" action="${pageContext.request.contextPath}/agent.do/update" method="post">
-                                <input name="id" type="hidden" value="${agent.id }">
-                                <div class="form-group">
-                                	<label class="col-sm-1 control-label">编号</label>
-                                	<div class="col-sm-11">
-                                		<select class="selectpicker form-control" name="agentId">
-	                                		<c:forEach items="${standardList }" var="standard">
-	                                			<option <c:if test="${agent.agentId==standard.agentId }">selected</c:if> value="${standard.agentId }">${standard.agentId }</option>
-	                                		</c:forEach>
-	                                	</select>
-                                	</div>
-                                </div>
-                                <div class="form-group">
-	                                <label class="col-sm-1 control-label">是否上架</label>
-	                                <div class="col-sm-11">
-		                                <select class="selectpicker form-control" name="isSale">
-		                                	<option value="true" <c:if test="${agent.isSale }">selected</c:if>>上架</option>
-		                                	<option value="false" <c:if test="${not agent.isSale }">selected</c:if>>下架</option>
-		                                </select>
-	                                </div>
-	                            </div>
-	                            <div class="form-group">
-	                                <label class="col-sm-1 control-label">高</label>
-	                                <div class="col-sm-11">
-	                                	<input class="form-control" type="number" name="high" value="${agent.high }">
-	                                </div>
-                                </div>
-                                <div class="form-group">
-	                                <label class="col-sm-1 control-label">长</label>
-	                                <div class="col-sm-11">
-	                                	<input class="form-control" type="number" name="length" value="${agent.length }">
-	                                </div>
-                                </div>
-                                <div class="form-group">
-	                                <label class="col-sm-1 control-label">宽</label>
-	                                <div class="col-sm-11">
-	                                	<input class="form-control" type="number" name="wide" value="${agent.wide }">
-	                                </div>
-                                </div>
-                                <div class="form-group">
-	                                <label class="col-sm-1 control-label">重量</label>
-	                                <div class="col-sm-11">
-	                                	<input class="form-control" type="number" name="weight" value="${agent.weight }">
-	                                </div>
-                                </div>
-                                <label class="col-sm-2 control-label"></label>
-                                <button type="submit"
-                                        class="btn btn-primary form-control">修改
-                                </button>
-                            </form>
-                        </div>
-                        <!-- /.table-responsive -->
-                    </div>
-                    <!-- /.panel-body -->
-                </div>
-                <!-- /.panel -->
-            </div>
-            <!-- /.col-lg-12 -->
-        </div>
-    </div>
-
-    <!-- /.container-fluid -->
-</div>
-<jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
+<jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
+<!-- Page Content -->
+<div id="page-wrapper">
+    <div class="container-fluid">
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
+        <div>
+            <h1 class="page-header">代理商管理</h1>
+        </div>
+        <div class="panel-heading">
+        </div>
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        代理商管理
+                    </div>
+                    <!-- /.panel-heading -->
+                    <div class="panel-body">
+                        <div class="dataTable_wrapper">
+                            <form:form action="${pageContext.request.contextPath}/agent.do/update" commandName="agent" method="post" cssClass="form-horizontal">
+                            	<div class="form-group">
+	                                <label class="col-sm-1 control-label">代理商级别</label>
+	                                <div class="col-sm-11">
+	                                	<select name="level" class="selectpicker form-control">
+                                			<option></option>
+	                                		<c:forEach items="${agentLevel }" var="entry">
+	                                			<option value="${entry.name() }" <c:if test="${agent.level==entry }">selected</c:if>>${entry.getName() }</option>
+	                                		</c:forEach>
+	                                	</select>
+	                                </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">代理商名称</label>
+	                                <div class="col-sm-11">
+	                                	<form:input path="agentName" cssClass="form-control"/>
+		                             </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">绑定员工</label>
+	                                <div class="col-sm-11">
+	                                	<form:select path="userIds" items="${userList }" itemValue="userId" itemLabel="username" cssClass="selectpicker form-control" multiple="multiple"/>
+	                                </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">区域</label>
+	                                <div class="col-sm-11">
+	                                	<form:input path="area" cssClass="form-control"/>
+	                                </div>
+                                </div>
+                                <label></label>
+                                <button type="submit"
+                                        class="btn btn-primary form-control">修改
+                                </button>
+                            </form:form>
+                        </div>
+                        <!-- /.table-responsive -->
+                    </div>
+                    <!-- /.panel-body -->
+                </div>
+                <!-- /.panel -->
+            </div>
+            <!-- /.col-lg-12 -->
+        </div>
+    </div>
+    <!-- /.container-fluid -->
+</div>
+<jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
diff --git a/target/classes/log4j.properties b/target/classes/log4j.properties
index 370bc49..ff1028a 100644
--- a/target/classes/log4j.properties
+++ b/target/classes/log4j.properties
@@ -1,4 +1,4 @@
-log4j.rootLogger = info , stdout
+log4j.rootLogger = debug , stdout
 
 ###  output to the console ###
 log4j.appender.stdout = org.apache.log4j.ConsoleAppender

From a69b76c0e4ebc1410c120e640bd53f1b069ab5fe Mon Sep 17 00:00:00 2001
From: Freepolis <jiaye9553@gmail.com>
Date: Thu, 16 Mar 2017 15:17:27 +0800
Subject: [PATCH 09/14] test

---
 pom.xml                                     | 13 +++++++++++--
 src/main/webapp/WEB-INF/view/admin/nav.jsp  |  5 +++++
 src/main/webapp/WEB-INF/view/vm/car/car.jsp |  2 +-
 src/main/webapp/js/main.js                  |  4 ++++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 35f7883..dad63c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -322,8 +322,17 @@
             <artifactId>commons-fileupload</artifactId>
             <version>1.3.1</version>
         </dependency>
-
-
+		<!-- commons -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.3.2</version>
+		</dependency>
+		<dependency>
+			<groupId>com.enterprisedt</groupId>
+			<artifactId>edtFTPj</artifactId>
+			<version>1.5.3</version>
+		</dependency>
 
     </dependencies>
 
diff --git a/src/main/webapp/WEB-INF/view/admin/nav.jsp b/src/main/webapp/WEB-INF/view/admin/nav.jsp
index d014690..d68d565 100644
--- a/src/main/webapp/WEB-INF/view/admin/nav.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/nav.jsp
@@ -119,6 +119,11 @@
                                 <a href="${pageContext.request.contextPath}/car.do/car.view/0"> 车辆管理</a>
                             </li>
                         	</shiro:hasPermission>
+                        	<shiro:hasPermission name="procurement">
+                            <li>
+                                <a href="${pageContext.request.contextPath}/procurement.do/procurement.view/0"> 采购管理</a>
+                            </li>
+                        	</shiro:hasPermission>
                         </ul>
                         <!-- /.nav-second-level -->
                     </li>
diff --git a/src/main/webapp/WEB-INF/view/vm/car/car.jsp b/src/main/webapp/WEB-INF/view/vm/car/car.jsp
index ba8c471..b629f01 100644
--- a/src/main/webapp/WEB-INF/view/vm/car/car.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/car/car.jsp
@@ -82,7 +82,7 @@
                                 </tbody>
                             </table>               
                              <a href="${pageContext.request.contextPath}/car.do/car_add.view" class="btn btn-primary" role="button">添加车辆</a>
-                            <button class="btn btn-primary" onclick="uploader.uploadModal('${pageContext.request.contextPath}/car.do/import','${pageContext.request.contextPath}/template/car_tpl.xlsx')">批量上传</button>       
+                            <button class="btn btn-primary" onclick="uploader.uploadModal('${pageContext.request.contextPath}/car.do/import','${pageContext.request.contextPath}/template/car_tpl.xlsx')">批量上传</button>    
                            <jsp:include page="/WEB-INF/view/admin/pageSplit.jsp"></jsp:include>
                            
                         </div>
diff --git a/src/main/webapp/js/main.js b/src/main/webapp/js/main.js
index bf7d23c..3f00b03 100644
--- a/src/main/webapp/js/main.js
+++ b/src/main/webapp/js/main.js
@@ -56,6 +56,8 @@ $(document).ready(function () {
 					fileElementId : "file",
 					dataType : "json",
 					success : function(data, status) {
+						console.log("================");
+						console.log(data);
 						if (data && data.resultCode == "0") {
 							swal('通知','上传成功','success');
 						} else {
@@ -63,6 +65,8 @@ $(document).ready(function () {
 						}
 					},
 					error : function(data, status, e) {
+						console.log("=======111111=========");
+						console.log(data);
 						swal('通知','上传失败','error');
 					}
 				});

From a7a87d2246305a5aaab5a0b05e6e1d087212e581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=8D=8E=E6=88=90?= <duhuacheng.ver@gmail.com>
Date: Thu, 16 Mar 2017 18:37:48 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E4=BB=A3=E7=90=86=E5=95=86=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90,=E6=89=B9=E9=87=8F=E4=B8=8A=E4=BC=A0=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |   2 +-
 src/main/java/com/entity/Agent.java           |  16 +++--
 .../com/entity/enumeration/AgentLevel.java    |  12 +++-
 .../com/vm/controller/AgentController.java    |  63 ++++++++++++++++--
 .../java/com/vm/controller/CarController.java |   7 ++
 .../com/vm/service/impl/AgentBizImpl.java     |  23 +++++--
 src/main/resources/mapper/AgentDao.xml        |  10 +--
 .../webapp/WEB-INF/view/admin/batchUpload.jsp |  29 ++++++++
 src/main/webapp/WEB-INF/view/admin/nav.jsp    |  32 +--------
 .../webapp/WEB-INF/view/vm/agent/agent.jsp    |   4 +-
 .../WEB-INF/view/vm/agent/agent_update.jsp    |   1 +
 src/main/webapp/js/main.js                    |  12 +++-
 src/main/webapp/template/agent_tpl.xlsx       | Bin 0 -> 9596 bytes
 13 files changed, 154 insertions(+), 57 deletions(-)
 create mode 100644 src/main/webapp/WEB-INF/view/admin/batchUpload.jsp
 create mode 100644 src/main/webapp/template/agent_tpl.xlsx

diff --git a/pom.xml b/pom.xml
index 35f7883..230cc4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -298,7 +298,7 @@
         <dependency>
 		    <groupId>com.alibaba</groupId>
 		    <artifactId>fastjson</artifactId>
-		    <version>1.2.17</version>
+		    <version>1.2.8</version>
 		</dependency>
         <!-- <dependency>
 		    <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/src/main/java/com/entity/Agent.java b/src/main/java/com/entity/Agent.java
index 3c2b34a..570c571 100644
--- a/src/main/java/com/entity/Agent.java
+++ b/src/main/java/com/entity/Agent.java
@@ -16,17 +16,17 @@ public class Agent implements Serializable{
     private List<String> userIds;
     private String userIdsStr;
     private String area;
+    
+    private volatile String usernames;
 	
 	public Agent() {
 		super();
 	}
 
-	public Agent(AgentLevel level, String agentName, String userIdsStr,
-			String area) {
+	public Agent(AgentLevel level, String agentName, String area) {
 		super();
 		this.level = level;
 		this.agentName = agentName;
-		this.setUserIdsStr(userIdsStr);
 		this.area = area;
 	}
 
@@ -73,8 +73,8 @@ public String getUserIdsStr() {
 
 	public void setUserIdsStr(String userIdsStr) {
 		this.userIdsStr = userIdsStr;
+		this.userIds = Lists.newArrayList();
 		if(!StringUtils.isEmpty(userIdsStr)) {
-			this.userIds = Lists.newArrayList();
 			String[] ids = userIdsStr.split(",");
 			for(String id : ids) {
 				this.userIds.add(id);
@@ -90,6 +90,14 @@ public void setArea(String area) {
 		this.area = area;
 	}
 
+	public String getUsernames() {
+		return usernames;
+	}
+
+	public void setUsernames(String usernames) {
+		this.usernames = usernames;
+	}
+
 	@Override
 	public String toString() {
 		return "Agent [id=" + id + ", level=" + level + ", agentName="
diff --git a/src/main/java/com/entity/enumeration/AgentLevel.java b/src/main/java/com/entity/enumeration/AgentLevel.java
index 73df30f..b5614a1 100644
--- a/src/main/java/com/entity/enumeration/AgentLevel.java
+++ b/src/main/java/com/entity/enumeration/AgentLevel.java
@@ -1,5 +1,7 @@
 package com.entity.enumeration;
 
+import org.springframework.util.StringUtils;
+
 public enum AgentLevel {
 	VIP("VIP"),NORMAL("普通"),POTENTIAL("潜在"),NOCARE("不关注");
 	private String name;
@@ -13,9 +15,13 @@ public void setName(String name) {
 		this.name = name;
 	}
 	
-	public static void main(String[] args) {
-		for(AgentLevel entry : AgentLevel.values()) {
-			System.out.println(entry.getName()+":"+entry.name());
+	public static AgentLevel parse(String text) {
+		if(!StringUtils.isEmpty(text)) {
+			for(AgentLevel entry : AgentLevel.values()) {
+				if(entry.getName().equals(text)) 
+					return entry;
+			}
 		}
+		return null;
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/com/vm/controller/AgentController.java b/src/main/java/com/vm/controller/AgentController.java
index e8e62b2..50305a9 100644
--- a/src/main/java/com/vm/controller/AgentController.java
+++ b/src/main/java/com/vm/controller/AgentController.java
@@ -1,26 +1,37 @@
 package com.vm.controller;
 
 import java.beans.PropertyEditorSupport;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import com.entity.Agent;
 import com.entity.enumeration.AgentLevel;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.system.service.UserBiz;
+import com.util.ResultMapUtil;
 import com.vm.service.AgentBiz;
 
 @Controller
@@ -38,7 +49,8 @@ protected void initBinder(WebDataBinder binder) {
     	binder.registerCustomEditor(AgentLevel.class, new PropertyEditorSupport(){
     		@Override  
 		    public void setAsText(String text) throws IllegalArgumentException {  
-		        this.setValue(AgentLevel.valueOf(text));  
+    			if(!StringUtils.isEmpty(text))
+    				this.setValue(AgentLevel.valueOf(text));  
 		    }  
 		    @Override  
 		    public String getAsText() {  
@@ -57,13 +69,12 @@ public String agentView(Model model) {
     @RequiresPermissions("agent:query")
     @RequestMapping("agent.view/{pageNum}/{pageSize}")
     public String agentView(Agent agent,Model m,@PathVariable("pageNum") int pageNum,
-    		@PathVariable("pageNum") int pageSize) {
+    		@PathVariable("pageSize") int pageSize) {
     	PageHelper.startPage(pageNum, pageSize);
     	List<Agent> list =  agentBiz.find(agent);
     	PageInfo<Agent> page = new PageInfo<Agent>(list);
         m.addAttribute("agentList", list);
         m.addAttribute("page", page);
-        m.addAttribute("agentLevel", AgentLevel.values());
         return "/vm/agent/agent";
     }
 
@@ -81,6 +92,7 @@ public String agentAddView(Model m) {
     public String agentUpdateView(Long id,Model m) {
     	m.addAttribute("agentLevel", AgentLevel.values());
     	m.addAttribute("agent",agentBiz.findById(id));
+    	m.addAttribute("userList", userBiz.findByRole("agent"));
         return "/vm/agent/agent_update";
     }
 
@@ -104,4 +116,43 @@ public String delete(Long id) {
         agentBiz.delete(id);
         return "redirect:/agent.do/agent.view";
     }
+    
+    
+    @SuppressWarnings("resource")
+	@RequiresPermissions("agent:import")
+    @RequestMapping("import")
+    @ResponseBody
+    @Transactional()
+    public Map<String,Object> imp(@RequestParam("file") CommonsMultipartFile file){
+    	Workbook wb = null;
+    	try {
+    		boolean isExcel2007 = file.getOriginalFilename().matches("^.+\\.(?i)(xlsx)$");  
+    		if(isExcel2007) {
+    			wb = new XSSFWorkbook(file.getInputStream());  
+    		} else {
+    			wb = new HSSFWorkbook(file.getInputStream());  
+    		}
+			Sheet sheet = wb.getSheetAt(0);   
+			int rowNum = sheet.getLastRowNum();
+			for(int i=1;i<=rowNum;i++) {
+				Row row = sheet.getRow(i);
+				String level = row.getCell(0).getStringCellValue();
+				AgentLevel agentLevel = AgentLevel.parse(level);
+				String agentName = row.getCell(1).getStringCellValue();
+				if(StringUtils.isEmpty(agentName)) continue;
+				String area = row.getCell(2).getStringCellValue();
+				Agent agent = new Agent(agentLevel,agentName,area);
+				
+				agentBiz.add(agent);
+			}
+		} catch(NullPointerException e) {
+			log.error("上传文件解析失败",e);
+			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+			return ResultMapUtil.getFailMap("字段不允许为空");
+		} catch (IOException e) {
+			log.error("上传文件解析失败",e);
+			return ResultMapUtil.getFailMap();
+		}
+    	return ResultMapUtil.getSuccessMap();
+    }
 }
diff --git a/src/main/java/com/vm/controller/CarController.java b/src/main/java/com/vm/controller/CarController.java
index c01b106..253efce 100644
--- a/src/main/java/com/vm/controller/CarController.java
+++ b/src/main/java/com/vm/controller/CarController.java
@@ -13,6 +13,8 @@
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.ui.Model;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -97,6 +99,7 @@ public String delete(Long id) {
 	@RequiresPermissions("car:import")
     @RequestMapping("import")
     @ResponseBody
+    @Transactional()
     public Map<String,Object> imp(@RequestParam("file") CommonsMultipartFile file){
     	Workbook wb = null;
     	try {
@@ -121,6 +124,10 @@ public Map<String,Object> imp(@RequestParam("file") CommonsMultipartFile file){
 				Car car = new Car(carId,isSale,high,length,wide,weight);
 				carBiz.add(car);
 			}
+		} catch(NullPointerException e) {
+			log.error("上传文件解析失败",e);
+			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+			return ResultMapUtil.getFailMap("字段不允许为空");
 		} catch (IOException e) {
 			log.error("上传文件解析失败",e);
 			return ResultMapUtil.getFailMap();
diff --git a/src/main/java/com/vm/service/impl/AgentBizImpl.java b/src/main/java/com/vm/service/impl/AgentBizImpl.java
index a81ac23..f86ef60 100644
--- a/src/main/java/com/vm/service/impl/AgentBizImpl.java
+++ b/src/main/java/com/vm/service/impl/AgentBizImpl.java
@@ -2,21 +2,36 @@
 
 import java.util.List;
 
-import javax.annotation.Resource;
-
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.entity.Agent;
+import com.entity.User;
+import com.system.dao.UserDao;
 import com.vm.dao.AgentDao;
 import com.vm.service.AgentBiz;
 
 @Service
 public class AgentBizImpl implements AgentBiz {
-    @Resource
+    @Autowired
     private AgentDao AgentDao;
+    @Autowired
+    private UserDao userDao;
 
     public List<Agent> find(Agent agent) {
-        return AgentDao.find(agent);
+    	List<Agent> list = AgentDao.find(agent);
+    	for(Agent entry : list) {
+    		if(StringUtils.isEmpty(entry.getUserIdsStr())) continue;
+    		StringBuffer buff = new StringBuffer();
+    		for(String uid : entry.getUserIds()) {
+    			User user = userDao.findById(uid);
+    			buff.append(user.getUsername()).append(',');
+    		}
+    		if(buff.length()!=0) buff.deleteCharAt(buff.length()-1);
+    		entry.setUsernames(buff.toString());
+    	}
+        return list;
     }
 
     @Override
diff --git a/src/main/resources/mapper/AgentDao.xml b/src/main/resources/mapper/AgentDao.xml
index f1b5e0f..b2439b6 100644
--- a/src/main/resources/mapper/AgentDao.xml
+++ b/src/main/resources/mapper/AgentDao.xml
@@ -18,14 +18,14 @@
     <select id="find" resultMap="agent_map" parameterType="Agent">
         SELECT * FROM agent
         <where>
-        	<if test="level!=null and level!=''">
+        	<if test="level!=null">
         		and level=#{level}
         	</if>
         	<if test="agentName!=null and agentName!=''">
-        		and agent_name=#{agentName}
+        		and agent_name like concat('%',#{agentName},'%')
         	</if>
         	<if test="area!=null and area!=''">
-        		and area=#{area}
+        		and area like concat('%',#{area},'%')
         	</if>
         </where>
     </select>
@@ -37,7 +37,7 @@
     <update id="update" parameterType="Agent">
         UPDATE agent 
         <set>
-        	<if test="level!=null and level!=''">
+        	<if test="level!=null">
         		level=#{level},
         	</if>
         	<if test="agentName!=null and agentName!=''">
@@ -47,7 +47,7 @@
         		area=#{area},
         	</if>
         	<if test="userIdsStr != null and userIdsStr != ''">
-        		user_ids=#{clerkIdStr},
+        		user_ids=#{userIdsStr},
         	</if>
         </set>
         WHERE id = #{id}
diff --git a/src/main/webapp/WEB-INF/view/admin/batchUpload.jsp b/src/main/webapp/WEB-INF/view/admin/batchUpload.jsp
new file mode 100644
index 0000000..6eb03c2
--- /dev/null
+++ b/src/main/webapp/WEB-INF/view/admin/batchUpload.jsp
@@ -0,0 +1,29 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+<div class="modal fade" id="uploadModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+<div class="modal-dialog">
+	<div class="modal-content">
+		<div class="modal-header">
+			<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+				&times;
+			</button>
+			<h4 class="modal-title" id="myModalLabel">
+				批量上传
+			</h4>
+		</div>
+		<div class="modal-body">
+			<form id="uploadForm" role="form" class="form-inline">
+				<div class="form-group">
+				    <label class="sr-only" for="file">文件输入</label>
+  						<input type="file" id="file" name="file" class="form-control">
+			  	</div>
+ 						<button type="submit" class="btn btn-default">上传</button>
+ 						<a class="btn btn-default hidden modaldownBtn">模板下载</a>
+			</form>
+		</div>
+		<div class="modal-footer">
+			<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+		</div>
+	</div><!-- /.modal-content -->
+</div><!-- /.modal -->
+</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/view/admin/nav.jsp b/src/main/webapp/WEB-INF/view/admin/nav.jsp
index 027f04b..7b13632 100644
--- a/src/main/webapp/WEB-INF/view/admin/nav.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/nav.jsp
@@ -48,8 +48,8 @@
 	
 	<style>
 		.breadcrumb {
-		    margin: 5px 0px -20px -5px;
-		    background-color: #f8f8f8;
+		    margin: 5px -10px -20px -10px;
+   			background-color: rgb(255, 255, 255);
 	    }
 	</style>
 </head>
@@ -133,30 +133,4 @@
         <!-- /.navbar-static-side -->
     </nav>
     
-    <div class="modal fade" id="uploadModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-		<div class="modal-dialog">
-			<div class="modal-content">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
-						&times;
-					</button>
-					<h4 class="modal-title" id="myModalLabel">
-						批量上传
-					</h4>
-				</div>
-				<div class="modal-body">
-					<form id="uploadForm" role="form" class="form-inline">
-						<div class="form-group">
-						    <label class="sr-only" for="file">文件输入</label>
-    						<input type="file" id="file" name="file">
-					  	</div>
-   						<button type="submit" class="btn btn-default">上传</button>
-   						<a class="btn btn-default hidden modaldownBtn">模板下载</a>
-					</form>
-				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-				</div>
-			</div><!-- /.modal-content -->
-		</div><!-- /.modal -->
-	</div>
+<jsp:include page="/WEB-INF/view/admin/batchUpload.jsp"></jsp:include>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/view/vm/agent/agent.jsp b/src/main/webapp/WEB-INF/view/vm/agent/agent.jsp
index f246ca6..0f12f6b 100644
--- a/src/main/webapp/WEB-INF/view/vm/agent/agent.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/agent/agent.jsp
@@ -69,9 +69,9 @@
                                 <tbody>
                                 <c:forEach var="agent" items="${agentList}">
                                     <tr>
-                                        <td>${agent.level}</td>
+                                        <td>${agent.level.getName()}</td>
                                         <td>${agent.agentName}</td>
-                                        <td>${agent.userIdsStr}</td>
+                                        <td>${agent.usernames}</td>
                                         <td>${agent.area}</td>
                                         <td>
                                             <a href="${pageContext.request.contextPath}/agent.do/agent_update.view?id=${agent.id}">修改</a>
diff --git a/src/main/webapp/WEB-INF/view/vm/agent/agent_update.jsp b/src/main/webapp/WEB-INF/view/vm/agent/agent_update.jsp
index 4929c64..75ed529 100644
--- a/src/main/webapp/WEB-INF/view/vm/agent/agent_update.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/agent/agent_update.jsp
@@ -21,6 +21,7 @@
                     <div class="panel-body">
                         <div class="dataTable_wrapper">
                             <form:form action="${pageContext.request.contextPath}/agent.do/update" commandName="agent" method="post" cssClass="form-horizontal">
+                            	<form:hidden path="id"/>
                             	<div class="form-group">
 	                                <label class="col-sm-1 control-label">代理商级别</label>
 	                                <div class="col-sm-11">
diff --git a/src/main/webapp/js/main.js b/src/main/webapp/js/main.js
index a506c54..0eaa588 100644
--- a/src/main/webapp/js/main.js
+++ b/src/main/webapp/js/main.js
@@ -61,13 +61,19 @@ $(document).ready(function () {
 					dataType : "json",
 					success : function(data, status) {
 						if (data && data.resultCode == "0") {
-							swal('通知','上传成功','success');
+							swal({
+								title:'通知',
+								text:'上传成功',
+								type:'success',
+							}, function(){
+								location.reload();
+							});
 						} else {
-							swal('通知','上传失败','error');
+							swal('通知','上传失败'+(data.resultMsg?':'+data.resultMsg:''),'error');
 						}
 					},
 					error : function(data, status, e) {
-						swal('通知','上传失败','error');
+						swal('通知','上传失败:服务器异常','error');
 					}
 				});
 				return false;
diff --git a/src/main/webapp/template/agent_tpl.xlsx b/src/main/webapp/template/agent_tpl.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..8b8511209003f098336f67782492ed4dd559ea86
GIT binary patch
literal 9596
zcmeHNbyQSq*B_*jlrAah4(XPXp(F)Ca%hH_LAr)c2T-KDBn3f`21U9NX;8Ym1-|jd
z>%CmRZ+-v2_pEi!S!d1Jd)Bj`{oC=|M+1nALIgkqU;qFBI)GPPC!Hq}01$u*01yH&
zZasP62!?{dP-ATmClJJl%iY1AHXG#@OD5nJ;{AV*|6&W2yyyY9@!-p!ygbK?ts&-x
zKGGo$kf-S(!8}J|O20=E?%;uj<u@1ZQCQ^80#nT%PxsnZu@t8&PZ8CZkzTN8LbEZx
zX96jR=H%a#xLB2lM0u!RYHLMDNGZ*GcV-U9iV`o;sj6K?Tkc9;xtHCVD8D~&DXlG7
zfxs_B)AJ>_Hs*fCoL}7gw<rmoqqbo~yEs_YC9EFC2m51P(~n~tzysBVDl9v8@$6<f
zE}$bRr2*pLE}44oi8s&)N&n%;NE%uNl4MLFtoY7mEQ^mU{VD2Y-1PIP$fHd`;*w75
z%otn!YbDQ|jlYY*hTtmNnd+aNwq1;RXh=yQD<o?kv1NJTjLMXt&Dj%jU-2luCNv?z
z;bqcb?o--rUih9zV=xN@DXi)>lB3Zvi)XmuYk;TnbmLMV&iBufD}jo(cTyG8Cjm3X
zZ)jo#>sItJZjlRPcU4%5;d?BWbBR^CMWD^ROyiC<gxvRKhoEpRpo*R&KzV(Q4AA%+
zWC@=(fo>rnJBL8zZ3JYET|o8_Zmu8Kf1&zcjL*L;y(CT*h|G&0vID!O>unU9Vxu3n
z=ayepwYWs$O}aD@N`mLsU7je&K(pT6^-L{yOZP}RvaHN;&%yV4b|*m|6P9W@Qm@+v
zysWK7Cx~}Zh~89c3!t|z+9*Eak7irS8b6YZDEXEh#Km~+Pv)wq+YXa>Z)hX@_@xV(
z!J#r<5u@SDCF+nl3XML2_I@P{F$i+D<Y~iMgP@RVxlNC!V^<ynJ3L>mAFh82pO9TY
zxSy??m3Oc8jc@l_Soa0JIr3d*gUgK79lIe-O$El_WaPBvvrS>ts)k&72%+C}l7jaN
zPXixb!DBFYSM~{Sg@k#(-hj}Z{@KcNgcbe?nE=TbuMQBu)FB{40l+|Vx99#HHExbB
zc4m%_c0cmmp9n%iBs&DW{=1J7O;zAW9{k4JSD`#^DbI)rCZOE(n>rhK7+qDYQ%rRH
zzK3&^Y;{JD$AH|(jv*d9eI3tE?&E$#COm3oFO0Z@;z?+~BZlhOchHB7VYXFz7p90x
zcxQ8cqj>8!ZZd@My<}V`M>>)4@+k`=d1y{Pz1-pZ;Sd4aejZmoTgV`Fx2pbZPt~IT
zd63p-DXgldhBleia_Rd0gQ;V*444Pa&;dE-Lvb7rz|iU_9s6mk{4vIU!*@$nkAAz>
zoOA3Ys$$^XqWcowAyC@TPDL6&);P#gc2d30&R3}HMK^2n)ILYg;g02ESI6f$#7_Uy
zWr|*n3B@4XpbOzLc!)O;F7sDsiHcKooZ`U_*+D+0L7AbPNH@opNxk(!kmFTWOWkpa
z5>!Rb7``Zac9P@Z&N&EFr)OQKGmgEuD89dmY9_m5@Dz;I-@;lxl=kH6WN&3guU|7k
z4Y)vE^&KsIjz-dN^10+wwOL~_Btu(|49GZUtTvu*el*_vYW~4cw+dK1l89a@&C}mL
zx-cS}KsS5gwkfGp+pbY4R+HEL$4(vray)!m7q2_uy2&~;t@`BL4{Eh$(PUExO`7^N
z`b#FM2l^E~`0ia8fc5y2b_Pjw4!hhu9<WphoT)kLhgBNhqdBIga5rd5>%#X1is|sC
zk|*usMUz8&C|xcw$^(+$3I{nNQ`B*8)UnkHf2V1GU=h@ZPeb3N<eEd&F93DnIg9;N
zNs{ZXqo>2)n5J+V#FMYryI8rwFS^x{Fd{oWJH9~WtB~f^X5Tz|$PL^ioqs>TS)O7k
z7TZpFC=O-g&FJkjyH<&m#_6wE$PN9t1&?wcT~c|R!D>Sko)RNcQB>s8^|)qt7qK({
z+`4-V<ySO_ts_SU0Em9yI*7HY3&=tX>S6=7g8Tq`ZX7T0gEUcxTkDR~G?-g7tb0k6
zC<shFdZ|>VO6x%i;WiVJVWH-*ASec+hvK3VOtbk?4!|A1+PFF&ev*2AvT$-GKHJ#K
z?~<h)Z;P=8X3mt8$z32)pp%dgnH9<Wm>Klgl0sXlqkFJyeD>QXTIYHb*<@N0#i%5f
zNACrwjaZ!Gv$!DPTnP-85t?1&_moZ3D;jCXt=_8y#3||d(@Es!!VViW8|OG`AEGMm
zU7e4Q5_*Z*i~+@roI_xw;aaT%6fZ0akuE9-3s5?O50Ga@b|H8m*jw&inir*3eftyW
zAjh$16}xn)N9d9pG$-m?p94uv4QjqPZrN@}%)HoCKPZAe`_gYL=yrB7?l^hvo#^GT
zhxsdmiaGEBTM>qoMHrRgCl(;qAP^MtM<o62f%iXgH0XJ2L>mv0{0Z{a19z|Zv0&^6
zT0-=-IxEO#=aXntuiz&{mtJqFKrKs4P6JDVDHr0eDJ^khIY#Sl1uvSDTEE%#n&fPj
zsSsYDCc@+thntRYH6<gfsVRqdz#kLet_Xf~?~?3;@5hOX7|hpj$>oWM;T}9)XOWbH
zB}KLl`^M;1+-lW39E(1Bfua(c`d6DVJ~ZOsoaTO|{ehr|B5)JQY$cIS`K^6_Gnoyy
z<8(V8T$Fr=-kyWwUs}M>P~Pw*8UV0J`J+wxEgC?rK@K49->$zcdsDv;OeuulM7k=5
z@1@Q$5ob;wiwsQoHs)+Lt{g%2nz*_rtlkj*f_f%m@o}c~P*rE1^binFehPp&cuO_o
zlTCyG>OK~A9J>wcqlz@LRb%^>gjyP_kb?u~&PMMgaN8gqLEL`T-51;mx8#Q5C)O07
z15?tDgR21#gGcUKiZdRW$XPgn7A{Y?7F>zrgJ=^ox?K(N%<?La@)*h6coIlG6g1t(
zR_I%?nj)-UGw%{~s*Vr4ysoNyVUmo-(vBI{IJ7eY&$N=d-v5>o+WP6SXJkNx_CpDL
zKIcpjp;bidF&Zcu&M;wdi`q;VPx{ew8rM!EV%m^A82VABg)b~Gx(Dbkk@0a9_CDCd
z;UIpXhxrh#N1-6BjxcZOS>7`nJNh|5Vsb~dL8)c2c&rsb7~3>&EFrsB*{gJ#tcSyY
zv%_PePqSLvc@OoB9U}OJB3hw3VahC+0)F{8=|lNTUG|h7+*yB)CehGx0l}0$9dt)&
zl4j9RN8_SWUBd>X_Ne?okt$s4`ZQpM^m(d-*H=4$G5gXkD^{gxoRNWiMuF|4GR9L}
zQU`!F?T3hbrD(q44!T@tLS`cwXMes_7fj^5CC&P(TYg85?cPP!NA79!ZQ^1?-S6of
zFypc^lZw!3V56A;kE6p2J$0HK#7RBp<>I|luyAqmeCN^{Btlr@OhL@t^!@m)RP#C6
z<=*MWE4-%N1rWjY6kdk-#Sugbf8DO`YQ<Rc{IV-&1y9OnZw499TWcOnFq?%LyDBOo
zdm$cBP2N$P5ML%d6{QySnjg7?c8Z}c&kWt&CnyQ;3vJl}7&DWEW_Nuz#(YDDBP7C8
zVCQ2v^7K;b{n}ko6U7ZS_ga1xhGrLDj&H}jl80;HZ=;wFc8N#@vfcd`P2_|fy%Hf>
z!3=SCf)Dv6X+QFB3FgHZyV<bRF8Tz6wMJV;H{x)&M8gHrs#FQXdOEFWgC_U-wmC=V
zdu!G?T~_I{Xn79E=IDBz7j(q6h4;cY=Yxo;eQ}D%trlCAg5(W>Y++D2GR4xnvBN?u
zA^t}su%^I(z6R4dP|inrEO~Uvq%S-x@{1%i0_Ld}Pg86tNGoVMk#boSybRCg>!(Zc
zFR8!zj|6{hk`E``jt`$_il&Os$IQ;a4rWf!!*ttl{&=29mVnge<}RMKwxN{v$mEDz
zv%HDHwVu5%?wrZqziD_fJ!@aS){id0@vCW_Vy5Nt!$WGn=7pVkse!pj+q3WbUdp2_
zUq>Wopj%yS`Hkx2Vj2tzWe-PcfaB?&4rBu8SdgMrs&AEKlFN!H=%kqT%e1YZ6}8*Z
zdHXZlxl<Ud??HxQ<;Y(Ro~4*VD46&w`}PuK%^lT>bbLZ8dg&@Amn6g*G{uY6J|@Q7
zS@eG}muEL<v3Xf)=qUyQ*?pF+c@Jc#9KmK41*UM2n+Z1ykfpj4p5H~8x#R9Zyp3J8
z<wVgIbyzjGCE`m(QhILq;GX$3gGbb1-HN%kpbW)Iw{WyL@9;`Lp_%re?ugl(?34{m
zTU$>*6HL`u6Fz+UMj|?{Y%0mc!lpu4KO$ybrnJrwM<eX5=U}M0ptlNNSlwtTlO=(n
zZm{xrl~hHdYMok+{y_nV9IRF{w?eYHE6tQU*~a(owdvg@))q|&tI4Ku8SKe`9g^V4
zTua2u`${3reOS9Wlm^2)@fyT|Mr6D-^k{G`RvI>X+;6i4>y=sK9r(U!MQ_sYzI387
zBa`t9D3;iAIOt?tX;_UQwMDb);O#L>9Vz7+a%Ox|`+6Z9XE~*MED_!AU=mE?cAS?O
zCsmL~G;-?qj;JxC1+`sSU6D4Z7!(j&_QkU$I6~x&2Fb`9&Uu4ACv=P3hIk*$mDp<M
z1+P&>Mz0<E^vUx}zNWrDwh2NBzEo<5!6h;o<9(Ph*jKz>5qG)BFy&w^clRdGFop)X
z3ZR#*H%dtJ=GK|Ur=nql1+S-fJWyR3W){C|iP1diwQ|6Nx|uxT5W9ZSsFWvt9$cEa
zJaeI<em^Vli~Xk6v@NH3U#a_h&-GHlKs%;dBV9Nl9WfmPQ}j{D<kyRqQjA%j@nb9*
zUE?>==))*BYZbSn<Eg8<a^)vN7<a$}jnOd5{f3dW)nGQCc(s$L{&WGWGSLDO<2j%7
zzKQpt)W)P@M$e10tgV3BHHr&?QJ7I4eY)NRpX%Lc2cPVAn|8ja;wIc~%cD=_+XUWb
z@uf86cU|B{<fwlZM%=!0dQym@s0AGW!1+CkL7*P?px-MZoj&lCFn$yFn;q%hvek|R
zJIc5SS1Ke_1Cxq}0Z(nhE5r9Y@>V}?XV)|yjfaj;rF%`(*!W8-gyvFpDNUi^U_V}T
zI_(phi&B_4Xq;b7UQb|6S~%rs3+q<?tWpN~eqMx~PgWh$ne4=96N6XPJ`g$Q*JA*g
zKXiHUS_VKjMdcVZ(f{F1sh~FeSjFLWP`rYT47UA|sC`XxTwV1m6ufwr<RBPNxI~+w
z_H!fxx#k&%K;>{wUi)@oe)Q1b*urJ*F-@DwZ_=(b&mX#ee3s(13)3;EF5<NUkQU{e
z5;qRGko3z+vsEfQ9LZMR%I$K#H7MBjy;NJMvPzNGWJSkf%L}S1{Md|&L_e=~xYM6c
zx>x@m!Kl|XqD1ex&M47)fU<z@s9Mr$Gw~i1ElJ<p+QyyFCoxIF0|T;HXded7vQ3|{
z{;okqS{Cdcbs)1pt6`ym@}QdIE0OC)@duL17lYjCTvQUPjbn@W%xm+qtG7rdl-DTE
z4_NAT##17qMm|YTCYK5w+l-Q2>2;H_SjK*iDtUQtTKQSS5GQR~gp03@*QqK5*60YI
z4%bX1b&dJz@Wzbh6<n$2(B0R3FVy<(Mb{haxzumS-~5j;*XnmW-$}<fO8H%#???@1
zQll7bkqN2zhVqz<T|9-MECydzH0r{s4odIfcn!RSYIwqZe6~Fe%k@OKdY1SvAbM)k
zhB`7lq~>JS_=~(q%_DXa=uCEX1scuaj)gS*Z^WgM%$Y+rLIO$(^KmAeA+BzT3%-{T
zWA@A@7|^GFm3AO1xtNRUljMLxpRh88a@<!tr^BHw)^_FfA&?lbtB`d_4YzPFz75=&
zd!kRld0h#Kz}P{^=-j&CiZZcT`#KN2J?*3K<yY7z9ZjF(bx;}XjI3TY!qMSp%#q%g
zKnl8}lG83g_S~AHcetHTsbeK_sWMgmA@s_W$1Q`$b>>S}r%8YR6Wq7@Zui#(nl~Lp
z?%F?{448*v1RTRJIFjW2a-E4@<gnm=BILu#kAFn*!X}l2d7)k2ARl>qt=#!}4o}Qw
zL0_EuN(g3mlK8vvii!~3RnGCNdzdK^#d70*o{^5fL>f;~gpVnra}-A~cx1mL?ML_c
zN5%ZJR*ur{0Z;MZH;}GM;WsGaiK(}`z(p~V9|UA?FQ{m-M}~ER9!|zw92qHBW{I-S
zN6OhIynS2G(7$c$+VgI{K~`&Dyh|9Fp+eKrXrE>-g9|KjAd{$EWu3X`wfo)oYVU)6
z=ytmhAb=onkI_-~jeN4_gg=R-%<T|3MH)%KJ8+ukhP3t!-AsNwN4;9LM#u?vuvjSa
zhQUL3x%WdRvg+S5i31KV6!iT}M)s*hIj4I*JyjY_V9_noF`bKb$p`H<2(ErC%BwRz
z0Mg-2&n)9K>JDdhh~ATXbu2qK=KX3m@1sD5P6S(+gB9+2oYZ2wS@+0U$;N;>s+g3)
zTUuS9wG3LJwMuIHaXG%R**w2bci4~{QtYG7%y)16-*KLe+*jRodli`Qf>y$ktQ>D5
zy)MAVwFG8hKe>zJmLXG`B5hO9MO;n$EW7ad`8;E^zb5mU&f?4QJD3tlx<kNG*}cg~
z9UW`ym&`(Pv_g`ZSNFXs)sC&0K9GCvpn1os%u2)`uhkjcmB&9w`asQq_vopkJk;W;
z$~E&V=%;aXtb8o-`;KA*mTL*3^yr%-WIfmIB<A)mA2s8gMrH1&mIuO~i{>+nej5KA
z9>e?WvI%#+^-PrIv~Xcxu7j*zWQg|@SRH!kyJ2NPStk#RTP&wg4eO6CoqlrOj?FcQ
zt@j8TOl)^bKW#uhU{EMlFyplB$#02Siafd6yjnzz=JMI}%b+~6z&r;X=)Re-J=!c|
zP&7#Qu@mqpG;Yp0L@hR>J|%aN#K=h&wOfxxb1l8N;ld;4WcK^76F{)e#&|NKiNi-E
z0el1xX5nbA;o|57;Wl-0`eW4dFZ+dnYieAp+B6S>KYi&Q+UYi?KbdX2M5c3_I8?W!
z>bBdLB>NK4cObkWa7Ny%yKr}8wFVp|akO|jj)}I{HA!cR&CN*_!V?05c63Y&My>hr
zsi65P?&v3^n=VINySIDpu<5aFP!rkT4o~Y0#4{uC@ef1OR3PCZE>Xbd?~gCbdSoM8
z$&j~S@kq(W5Mr#O@Zt5BFF3-BiXOhbrh)UyEO;OK;W#mGNv^+C9o8)X^@<&6O<0>k
zOrmv_w7O{&6f?YoCngjEiM=_nvY)`3V$f>%NWD`d@^nd-EjZXggcw%__$!%pd7Ll8
zA4ZT^aatep0+)qKx57YDIxyS<lhOzUk$WX&4oc_aAwiEMXJ^ExuRYGa*oD^~l;U-i
zE{uD}jWh+oE<g2~%+s1?IDrOb>k3KOzKOMr@H!3f%;O68Pyj-OI=nAG9u7;*LgrAG
z-rd{G-uZN?{K|Amow%(>@FdbqzZip&+N5U7NG5fJK4(j1x!T2!#n^KeYi6rF1dppA
zgZZo@wO_Od^XmNN68|s5>~&;Ai8#WaA0a|5!C(E^+|dQ}uR|kj_Q&BJXAJznL)1Qp
z+Wer)D+L<3raTqUolb?JMl>hu@&z?T>fR7|ZdPE%7X3jda9iZWO`VHX4}F43$|P;D
zNY+C^<5q+Xm$p_`&6a4RV)%i!^Q0{*u_)|8@%eGSMZU>oTjXc764LoNY0WZ|d|9s@
z)qo0fFZd{^H49cdqN_<$_O3Ogl6w-6PEgr$M|^2iYZ_UL|IQF**F>1W+`DK%KTj2{
zj7R7JBDFuo)2%DUd6Xoax2s4v3yly1K?K8cF6KX4Z`N^bEb}UKW-L7KJFxS%Wz%kE
zM=RtKVNXO|uPz0OHwLv=kDjTH@2LU&gwZaQqu-Lb`2*Bt{msI>bZ1wdt54l8x}eUt
zNLr5Mq>~rVxa^F)k{r~47qnjAIjDcp%iuggXcdXMhfU^U><c?5{Z$S9wgAOk7Gc$C
z#L0{}5xlSyf>nfqT(m$?=ns1F<})vsnGM*?BomvblIP6~5=CptKub$!OBYY%R1gDd
z=Qpb`6SG^x1S-AK!?CSFvR?3NepwOPWXv#`LqA&S8iZ^AqLhD2z4Z<k;rY>s6EU~{
z8OhCEAy7w$e|;ZewLgwjxP)Wi4=Pgm5--86<5Lhm1FbFX+9aKWm01c3>Qtv-RpGi{
zd5*8e&MCA!rr+mm+33h5Zp>AIl*a%cBX?N=dam8F^5JeNom10L_F8lTYHD6!%KjCX
zU!^5{%xyTpf3VEoY9|!iykkJ~KA6CaI&SRo=ToOiLP3WqXMIXZw$~E*K_xsiX+l^y
ze!{1HJxtfexjf%(SDxY?;6r=9qe}+ro~aS-=BO3bsVTu$V{};Phe#?C^TJ9nvz{1i
zO?=oUgnc#0$6r+lUMv6fH0G1x-3~RB)y22I?vUAps@NCuvC><7(L;P7OtURz+HPI(
zn3yP~Hi-Ae%Bfyq@7~t)C4@8o;YLWeI1#k?uRj3!(`J9(fAKkp2Jr6+{yvWWQ}D<A
zEuzZ!%W(Rp;NORGe-&ItFs=Xli0-DIo0FQKn#d7c?v1(4P2roff}g^pSicGXV{&j)
z!%cGhrv^ss|NQ;`MU~%Fc#~`XsgN1bv?JDYlX<?W;AWfuQ^6L3yGAJZ+4SEOz1g??
z6xBmG&>yz^M;CKb%iqh)pE>}5ZE^tMX3=?5`tM2ouhLCaf06z(#orXa8K8eE;HCL(
t3ICsP{ST#o3%5U20syrLrT<yc&)};8L`69951IuBV1>ZJHQkS={{i7a+qeJ#

literal 0
HcmV?d00001


From 276ea7cf105074de07917e36be1ad4b24aef55ba Mon Sep 17 00:00:00 2001
From: Freepolis <jiaye9553@gmail.com>
Date: Sat, 18 Mar 2017 11:01:13 +0800
Subject: [PATCH 11/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/view/admin/nav.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/view/admin/nav.jsp b/src/main/webapp/WEB-INF/view/admin/nav.jsp
index 9572c83..d313faa 100644
--- a/src/main/webapp/WEB-INF/view/admin/nav.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/nav.jsp
@@ -126,7 +126,7 @@
                         	</shiro:hasPermission>
                         	<shiro:hasPermission name="procurement">
                             <li>
-                                <a href="${pageContext.request.contextPath}/procurement.do/procurement.view/0"> 采购管理</a>
+                                <a href="${pageContext.request.contextPath}/procurement.do/procurement.view"> 采购管理</a>
                             </li>
                         	</shiro:hasPermission>
                         </ul>

From 3a7cd44b354199368153476c800618d6383a6ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=8D=8E=E6=88=90?= <duhuacheng.ver@gmail.com>
Date: Tue, 21 Mar 2017 18:20:04 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E4=BB=A3=E7=90=86=E5=95=86,=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F,=E5=8E=82=E5=95=86,=E8=AE=A2=E5=8D=95(=E9=83=A8?=
 =?UTF-8?q?=E5=88=86)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .springBeans                                  |  15 ++
 pom.xml                                       |  90 +++++---
 src/main/java/com/entity/Agent.java           |  12 +-
 src/main/java/com/entity/Area.java            |  25 +++
 src/main/java/com/entity/Order.java           |  81 +++++++
 src/main/java/com/entity/Vendor.java          |  77 +++++++
 .../com/entity/enumeration/AgentLevel.java    |  67 +++---
 .../com/entity/enumeration/OrderType.java     |  29 +++
 .../java/com/entity/enumeration/Status.java   |   6 +
 .../interceptor/BreadcrumbIntercepter.java    |   5 +-
 .../com/vm/controller/AgentController.java    |   8 +-
 .../com/vm/controller/AreaController.java     |  76 +++++++
 .../com/vm/controller/OrderController.java    | 173 +++++++++++++++
 .../com/vm/controller/VendorController.java   |  76 +++++++
 src/main/java/com/vm/dao/AgentDao.java        |   1 +
 src/main/java/com/vm/dao/AreaDao.java         |  17 ++
 src/main/java/com/vm/dao/OrderDao.java        |  18 ++
 src/main/java/com/vm/dao/VendorDao.java       |  17 ++
 src/main/java/com/vm/service/AgentBiz.java    |   4 +-
 src/main/java/com/vm/service/AreaBiz.java     |  17 ++
 src/main/java/com/vm/service/CarBiz.java      |   3 +-
 src/main/java/com/vm/service/OrderBiz.java    |  19 ++
 src/main/java/com/vm/service/VendorBiz.java   |  17 ++
 .../com/vm/service/impl/AgentBizImpl.java     |   5 +
 .../java/com/vm/service/impl/AreaBizImpl.java |  38 ++++
 .../java/com/vm/service/impl/CarBizImpl.java  |   7 +
 .../com/vm/service/impl/OrderBizImpl.java     |  37 ++++
 .../com/vm/service/impl/StandardBizImpl.java  |   4 -
 .../com/vm/service/impl/VendorBizImpl.java    |  38 ++++
 src/main/resources/breadcrumb-e-c.properties  |   2 +
 src/main/resources/db.properties              |  10 +-
 src/main/resources/log4j.properties           |   3 +-
 src/main/resources/mapper/AgentDao.xml        |  10 +-
 src/main/resources/mapper/AreaDao.xml         |  45 ++++
 src/main/resources/mapper/OrderDao.xml        |  55 +++++
 src/main/resources/mapper/VendorDao.xml       |  74 +++++++
 .../resources/{ => spring}/mybatis-config.xml |   4 +
 .../{ => spring}/spring-mvc-shiro.xml         |  32 +--
 .../resources/{ => spring}/spring-mvc.xml     |   2 +-
 .../resources/{ => spring}/spring-shiro.xml   |   4 +-
 src/main/resources/{ => spring}/spring.xml    |   4 +-
 src/main/webapp/WEB-INF/view/admin/nav.jsp    |  10 +
 .../webapp/WEB-INF/view/vm/agent/agent.jsp    | 206 +++++++++---------
 .../WEB-INF/view/vm/agent/agent_add.jsp       |   8 +-
 .../WEB-INF/view/vm/agent/agent_update.jsp    | 148 +++++++------
 src/main/webapp/WEB-INF/view/vm/area/area.jsp |  82 +++++++
 .../webapp/WEB-INF/view/vm/area/area_add.jsp  |  47 ++++
 .../WEB-INF/view/vm/area/area_update.jsp      |  48 ++++
 .../view/vm/order/external_order_add.jsp      |  64 ++++++
 .../vm/order/external_order_add_success.jsp   |  32 +++
 .../webapp/WEB-INF/view/vm/order/order.jsp    | 102 +++++++++
 .../WEB-INF/view/vm/order/order_update.jsp    |  71 ++++++
 .../webapp/WEB-INF/view/vm/vendor/vendor.jsp  | 102 +++++++++
 .../WEB-INF/view/vm/vendor/vendor_add.jsp     |  83 +++++++
 .../WEB-INF/view/vm/vendor/vendor_update.jsp  |  84 +++++++
 src/main/webapp/WEB-INF/web.xml               |  20 +-
 src/main/webapp/js/main.js                    |   2 +
 src/main/webapp/template/agent_tpl.xlsx       | Bin 9596 -> 9634 bytes
 target/classes/db.properties                  |  10 +-
 target/classes/log4j.properties               |   3 +-
 60 files changed, 2069 insertions(+), 280 deletions(-)
 create mode 100644 .springBeans
 create mode 100644 src/main/java/com/entity/Area.java
 create mode 100644 src/main/java/com/entity/Order.java
 create mode 100644 src/main/java/com/entity/Vendor.java
 create mode 100644 src/main/java/com/entity/enumeration/OrderType.java
 create mode 100644 src/main/java/com/entity/enumeration/Status.java
 create mode 100644 src/main/java/com/vm/controller/AreaController.java
 create mode 100644 src/main/java/com/vm/controller/OrderController.java
 create mode 100644 src/main/java/com/vm/controller/VendorController.java
 create mode 100644 src/main/java/com/vm/dao/AreaDao.java
 create mode 100644 src/main/java/com/vm/dao/OrderDao.java
 create mode 100644 src/main/java/com/vm/dao/VendorDao.java
 create mode 100644 src/main/java/com/vm/service/AreaBiz.java
 create mode 100644 src/main/java/com/vm/service/OrderBiz.java
 create mode 100644 src/main/java/com/vm/service/VendorBiz.java
 create mode 100644 src/main/java/com/vm/service/impl/AreaBizImpl.java
 create mode 100644 src/main/java/com/vm/service/impl/OrderBizImpl.java
 create mode 100644 src/main/java/com/vm/service/impl/VendorBizImpl.java
 create mode 100644 src/main/resources/mapper/AreaDao.xml
 create mode 100644 src/main/resources/mapper/OrderDao.xml
 create mode 100644 src/main/resources/mapper/VendorDao.xml
 rename src/main/resources/{ => spring}/mybatis-config.xml (88%)
 rename src/main/resources/{ => spring}/spring-mvc-shiro.xml (98%)
 rename src/main/resources/{ => spring}/spring-mvc.xml (96%)
 rename src/main/resources/{ => spring}/spring-shiro.xml (95%)
 rename src/main/resources/{ => spring}/spring.xml (93%)
 create mode 100644 src/main/webapp/WEB-INF/view/vm/area/area.jsp
 create mode 100644 src/main/webapp/WEB-INF/view/vm/area/area_add.jsp
 create mode 100644 src/main/webapp/WEB-INF/view/vm/area/area_update.jsp
 create mode 100644 src/main/webapp/WEB-INF/view/vm/order/external_order_add.jsp
 create mode 100644 src/main/webapp/WEB-INF/view/vm/order/external_order_add_success.jsp
 create mode 100644 src/main/webapp/WEB-INF/view/vm/order/order.jsp
 create mode 100644 src/main/webapp/WEB-INF/view/vm/order/order_update.jsp
 create mode 100644 src/main/webapp/WEB-INF/view/vm/vendor/vendor.jsp
 create mode 100644 src/main/webapp/WEB-INF/view/vm/vendor/vendor_add.jsp
 create mode 100644 src/main/webapp/WEB-INF/view/vm/vendor/vendor_update.jsp

diff --git a/.springBeans b/.springBeans
new file mode 100644
index 0000000..095bc93
--- /dev/null
+++ b/.springBeans
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+	<version>1</version>
+	<pluginVersion><![CDATA[3.3.0.me201310081624]]></pluginVersion>
+	<configSuffixes>
+		<configSuffix><![CDATA[xml]]></configSuffix>
+	</configSuffixes>
+	<enableImports><![CDATA[false]]></enableImports>
+	<configs>
+		<config>src/main/resources/spring/spring.xml</config>
+		<config>src/main/resources/spring/spring-mvc.xml</config>
+	</configs>
+	<configSets>
+	</configSets>
+</beansProjectDescription>
diff --git a/pom.xml b/pom.xml
index 230cc4c..beed857 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,13 +11,18 @@
     <url>http://maven.apache.org</url>
     
     <properties>
-    	<spring.version>4.3.7.RELEASE</spring.version>
+    	<spring.version>4.1.5.RELEASE</spring.version>
     	<shiro.version>1.4.0-RC2</shiro.version>
     	<poi.version>3.15</poi.version>
     	<jackson.version>2.8.7</jackson.version>
+    	<activiti.version>5.22.0</activiti.version>
     </properties>
 
 	<repositories>
+		<repository>
+	      <id>Activiti</id>
+	      <url>https://maven.alfresco.com/nexus/content/groups/public/</url>
+	   </repository>
 		<repository>
 			<id>maven-net-cn</id>
 			<name>Maven China Mirror</name>
@@ -44,6 +49,33 @@
             <version>1.3</version>
         </dependency>
         
+		<!-- activiti5 -->
+		<!-- 
+          <dependency>
+	        <groupId>org.activiti</groupId>
+	        <artifactId>activiti-engine</artifactId>
+	        <version>${activiti.version}</version>
+	      </dependency>
+          <dependency>
+	        <groupId>org.activiti</groupId>
+	        <artifactId>activiti-spring</artifactId>
+	        <version>${activiti.version}</version>
+	        <exclusions>
+	        	<exclusion>
+	        		<artifactId>org.springframework</artifactId>
+	        		<groupId>spring-context</groupId>
+	        	</exclusion>
+	        	<exclusion>
+	        		<artifactId>org.springframework</artifactId>
+	        		<groupId>spring-orm</groupId>
+	        	</exclusion>
+	        	<exclusion>
+	        		<artifactId>commons-dbcp</artifactId>
+	        		<groupId>commons-dbcp</groupId>
+	        	</exclusion>
+	        </exclusions>
+	      </dependency> -->
+        
         <!-- poi -->
         <dependency>
             <groupId>org.apache.poi</groupId>
@@ -131,6 +163,16 @@
             	</exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>
@@ -220,11 +262,6 @@
             <artifactId>commons-logging</artifactId>
             <version>1.2</version>
         </dependency> -->
-        <dependency>  
-		    <groupId>org.bgee.log4jdbc-log4j2</groupId>  
-		    <artifactId>log4jdbc-log4j2-jdbc4.1</artifactId>  
-		    <version>1.16</version>  
-		</dependency>  
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -235,11 +272,6 @@
             <artifactId>log4j</artifactId>
             <version>1.2.17</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>2.3</version>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
@@ -273,11 +305,6 @@
             	</exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-			<groupId>commons-collections</groupId>
-			<artifactId>commons-collections</artifactId>
-			<version>3.2.2</version>
-		</dependency>
         <dependency>
 			<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>
@@ -300,21 +327,6 @@
 		    <artifactId>fastjson</artifactId>
 		    <version>1.2.8</version>
 		</dependency>
-        <!-- <dependency>
-		    <groupId>com.fasterxml.jackson.core</groupId>
-		    <artifactId>jackson-core</artifactId>
-		    <version>${jackson.version}</version>
-		</dependency>
-		<dependency>  
-		    <groupId>com.fasterxml.jackson.core</groupId>  
-		    <artifactId>jackson-databind</artifactId>  
-		    <version>${jackson.version}</version>  
-		</dependency>  
-		<dependency>  
-		    <groupId>com.fasterxml.jackson.core</groupId>  
-		    <artifactId>jackson-annotations</artifactId>  
-		    <version>${jackson.version}</version>  
-		</dependency>   -->
 
         <!--file upload-->
         <dependency>
@@ -323,7 +335,21 @@
             <version>1.3.1</version>
         </dependency>
 
-
+		<dependency>
+		    <groupId>org.codehaus.mojo</groupId>
+		    <artifactId>animal-sniffer-annotations</artifactId>
+		    <version>1.15</version>
+		</dependency>
+		<dependency>
+		    <groupId>com.google.code.findbugs</groupId>
+		    <artifactId>jsr305</artifactId>
+		    <version>3.0.1</version>
+		</dependency>
+		<dependency>
+		    <groupId>com.google.errorprone</groupId>
+		    <artifactId>error_prone_annotations</artifactId>
+		    <version>2.0.19</version>
+		</dependency>
 
     </dependencies>
 
diff --git a/src/main/java/com/entity/Agent.java b/src/main/java/com/entity/Agent.java
index 570c571..d7dcca8 100644
--- a/src/main/java/com/entity/Agent.java
+++ b/src/main/java/com/entity/Agent.java
@@ -11,6 +11,7 @@
 public class Agent implements Serializable{
 	private static final long serialVersionUID = 4678225051291399613L;
 	private Long id;
+	private String openid;
     private AgentLevel level;
     private String agentName;
     private List<String> userIds;
@@ -23,11 +24,12 @@ public Agent() {
 		super();
 	}
 
-	public Agent(AgentLevel level, String agentName, String area) {
+	public Agent(AgentLevel level, String agentName, String area, String openid) {
 		super();
 		this.level = level;
 		this.agentName = agentName;
 		this.area = area;
+		this.openid = openid;
 	}
 
 	public Long getId() {
@@ -46,6 +48,14 @@ public void setLevel(AgentLevel level) {
 		this.level = level;
 	}
 
+	public String getOpenid() {
+		return openid;
+	}
+
+	public void setOpenid(String openid) {
+		this.openid = openid;
+	}
+
 	public String getAgentName() {
 		return agentName;
 	}
diff --git a/src/main/java/com/entity/Area.java b/src/main/java/com/entity/Area.java
new file mode 100644
index 0000000..6d46248
--- /dev/null
+++ b/src/main/java/com/entity/Area.java
@@ -0,0 +1,25 @@
+package com.entity;
+
+import java.io.Serializable;
+
+public class Area implements Serializable {
+	private static final long serialVersionUID = 8852738152430122859L;
+	private Long id;
+	private String area;
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public String getArea() {
+		return area;
+	}
+	public void setArea(String area) {
+		this.area = area;
+	}
+	@Override
+	public String toString() {
+		return "Area [id=" + id + ", area=" + area + "]";
+	}
+}
diff --git a/src/main/java/com/entity/Order.java b/src/main/java/com/entity/Order.java
new file mode 100644
index 0000000..7d2c4de
--- /dev/null
+++ b/src/main/java/com/entity/Order.java
@@ -0,0 +1,81 @@
+package com.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.entity.enumeration.OrderType;
+import com.entity.enumeration.Status;
+
+public class Order implements Serializable{
+	private static final long serialVersionUID = -2545303099330416597L;
+	private Long id;
+	private String openid;
+	private String carId;
+	private Integer carCnt;
+	private Double price;
+	private Status status;
+	private OrderType orderType;
+	private Date startTime;
+	private Date deliverTime;
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public String getOpenid() {
+		return openid;
+	}
+	public void setOpenid(String openid) {
+		this.openid = openid;
+	}
+	public String getCarId() {
+		return carId;
+	}
+	public void setCarId(String carId) {
+		this.carId = carId;
+	}
+	public Integer getCarCnt() {
+		return carCnt;
+	}
+	public void setCarCnt(Integer carCnt) {
+		this.carCnt = carCnt;
+	}
+	public Double getPrice() {
+		return price;
+	}
+	public void setPrice(Double price) {
+		this.price = price;
+	}
+	public Status getStatus() {
+		return status;
+	}
+	public void setStatus(Status status) {
+		this.status = status;
+	}
+	public OrderType getOrderType() {
+		return orderType;
+	}
+	public void setOrderType(OrderType orderType) {
+		this.orderType = orderType;
+	}
+	public Date getStartTime() {
+		return startTime;
+	}
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+	public Date getDeliverTime() {
+		return deliverTime;
+	}
+	public void setDeliverTime(Date deliverTime) {
+		this.deliverTime = deliverTime;
+	}
+	@Override
+	public String toString() {
+		return "Order [id=" + id + ", openid=" + openid + ", carId=" + carId
+				+ ", carCnt=" + carCnt + ", price=" + price + ", status="
+				+ status + ", orderType=" + orderType + ", startTime="
+				+ startTime + ", deliverTime=" + deliverTime + "]";
+	}
+}
diff --git a/src/main/java/com/entity/Vendor.java b/src/main/java/com/entity/Vendor.java
new file mode 100644
index 0000000..521cc54
--- /dev/null
+++ b/src/main/java/com/entity/Vendor.java
@@ -0,0 +1,77 @@
+package com.entity;
+
+import java.io.Serializable;
+
+public class Vendor implements Serializable {
+	private static final long serialVersionUID = -4471300730875048038L;
+	private Long id;
+	private String vendorName;
+	private String contact;
+	private String url;
+	private String address;
+	private String telephone;
+	private String phone;
+	private String email;
+	private Long attachId;
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public String getVendorName() {
+		return vendorName;
+	}
+	public void setVendorName(String vendorName) {
+		this.vendorName = vendorName;
+	}
+	public String getContact() {
+		return contact;
+	}
+	public void setContact(String contact) {
+		this.contact = contact;
+	}
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	public String getAddress() {
+		return address;
+	}
+	public void setAddress(String address) {
+		this.address = address;
+	}
+	public String getTelephone() {
+		return telephone;
+	}
+	public void setTelephone(String telephone) {
+		this.telephone = telephone;
+	}
+	public String getPhone() {
+		return phone;
+	}
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
+	public Long getAttachId() {
+		return attachId;
+	}
+	public void setAttachId(Long attachId) {
+		this.attachId = attachId;
+	}
+	public String getEmail() {
+		return email;
+	}
+	public void setEmail(String email) {
+		this.email = email;
+	}
+	@Override
+	public String toString() {
+		return "Vendor [id=" + id + ", vendorName=" + vendorName + ", contact="
+				+ contact + ", url=" + url + ", address=" + address
+				+ ", telephone=" + telephone + ", phone=" + phone + ", email="
+				+ email + ", attachId=" + attachId + "]";
+	}
+}
diff --git a/src/main/java/com/entity/enumeration/AgentLevel.java b/src/main/java/com/entity/enumeration/AgentLevel.java
index b5614a1..2de0a37 100644
--- a/src/main/java/com/entity/enumeration/AgentLevel.java
+++ b/src/main/java/com/entity/enumeration/AgentLevel.java
@@ -1,27 +1,42 @@
-package com.entity.enumeration;
-
-import org.springframework.util.StringUtils;
-
-public enum AgentLevel {
-	VIP("VIP"),NORMAL("普通"),POTENTIAL("潜在"),NOCARE("不关注");
-	private String name;
-	AgentLevel(String name) {
-		this.name = name;
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	public static AgentLevel parse(String text) {
-		if(!StringUtils.isEmpty(text)) {
-			for(AgentLevel entry : AgentLevel.values()) {
-				if(entry.getName().equals(text)) 
-					return entry;
-			}
-		}
-		return null;
-	}
+package com.entity.enumeration;
+
+import org.springframework.util.StringUtils;
+
+public enum AgentLevel {
+	VIP("VIP",0,Integer.MAX_VALUE),NORMAL("普通",0,2000),NOCARE("不关注",2000,5000);
+	private String name;
+	private Integer minPrice;
+	private Integer maxPrice;
+	AgentLevel(String name,Integer minPrice,Integer maxPrice) {
+		this.name = name;
+		this.minPrice=minPrice;
+		this.maxPrice=maxPrice;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public Integer getMinPrice() {
+		return minPrice;
+	}
+	public void setMinPrice(Integer minPrice) {
+		this.minPrice = minPrice;
+	}
+	public Integer getMaxPrice() {
+		return maxPrice;
+	}
+	public void setMaxPrice(Integer maxPrice) {
+		this.maxPrice = maxPrice;
+	}
+	public static AgentLevel parse(String text) {
+		if(!StringUtils.isEmpty(text)) {
+			for(AgentLevel entry : AgentLevel.values()) {
+				if(entry.getName().equals(text)) 
+					return entry;
+			}
+		}
+		return null;
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/com/entity/enumeration/OrderType.java b/src/main/java/com/entity/enumeration/OrderType.java
new file mode 100644
index 0000000..571d74f
--- /dev/null
+++ b/src/main/java/com/entity/enumeration/OrderType.java
@@ -0,0 +1,29 @@
+package com.entity.enumeration;
+
+import org.springframework.util.StringUtils;
+
+
+public enum OrderType {
+	DISTRIBUTION("分销订单"),DISTRIBUTION_REJECTED("分销退货订单"),DISTRIBUTION_EXCHANGE("分销换货订单");
+	
+	private String name;
+	OrderType(String name) {
+		this.name = name;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	public static AgentLevel parse(String text) {
+		if(!StringUtils.isEmpty(text)) {
+			for(AgentLevel entry : AgentLevel.values()) {
+				if(entry.getName().equals(text)) 
+					return entry;
+			}
+		}
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/entity/enumeration/Status.java b/src/main/java/com/entity/enumeration/Status.java
new file mode 100644
index 0000000..54dfc6d
--- /dev/null
+++ b/src/main/java/com/entity/enumeration/Status.java
@@ -0,0 +1,6 @@
+package com.entity.enumeration;
+
+
+public enum Status {
+	START,END,UNAUDIT,AUDIT,NON_PAYMENT,PAYMENT,NOT_DISTRIBUTION,DISTRIBUTION;
+}
\ No newline at end of file
diff --git a/src/main/java/com/system/interceptor/BreadcrumbIntercepter.java b/src/main/java/com/system/interceptor/BreadcrumbIntercepter.java
index 0c3ba7f..799ccad 100644
--- a/src/main/java/com/system/interceptor/BreadcrumbIntercepter.java
+++ b/src/main/java/com/system/interceptor/BreadcrumbIntercepter.java
@@ -20,9 +20,6 @@
 import com.google.common.collect.Lists;
 import com.system.model.Breadcrumb;
 
-/**
- * Created by c0de8ug on 16-2-14.
- */
 public class BreadcrumbIntercepter implements HandlerInterceptor {
 	private Logger log = Logger.getLogger(BreadcrumbIntercepter.class);
 	private Properties properties;
@@ -53,7 +50,7 @@ public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletRespo
         	}
         }
         
-        if(url.indexOf("view") == -1) return true;
+        if(url.indexOf("view") == -1 || url.indexOf("external") != -1) return true;
 
         List<Breadcrumb> breadcrumbs = (List<Breadcrumb>)session.getAttribute("breadcrumbs");
         Matcher matcher = pc.matcher(url);
diff --git a/src/main/java/com/vm/controller/AgentController.java b/src/main/java/com/vm/controller/AgentController.java
index 50305a9..e4aaa7a 100644
--- a/src/main/java/com/vm/controller/AgentController.java
+++ b/src/main/java/com/vm/controller/AgentController.java
@@ -33,6 +33,7 @@
 import com.system.service.UserBiz;
 import com.util.ResultMapUtil;
 import com.vm.service.AgentBiz;
+import com.vm.service.AreaBiz;
 
 @Controller
 @RequestMapping("agent.do")
@@ -43,6 +44,8 @@ public class AgentController {
     private AgentBiz agentBiz;
     @Autowired
     private UserBiz userBiz;
+    @Autowired
+    private AreaBiz areaBiz;
     
     @InitBinder    
     protected void initBinder(WebDataBinder binder) {
@@ -83,6 +86,7 @@ public String agentView(Agent agent,Model m,@PathVariable("pageNum") int pageNum
     public String agentAddView(Model m) {
     	m.addAttribute("agent", new Agent());
     	m.addAttribute("agentLevel", AgentLevel.values());
+    	m.addAttribute("areaList", areaBiz.find(null));
     	m.addAttribute("userList", userBiz.findByRole("agent"));
         return "/vm/agent/agent_add";
     }
@@ -92,6 +96,7 @@ public String agentAddView(Model m) {
     public String agentUpdateView(Long id,Model m) {
     	m.addAttribute("agentLevel", AgentLevel.values());
     	m.addAttribute("agent",agentBiz.findById(id));
+    	m.addAttribute("areaList", areaBiz.find(null));
     	m.addAttribute("userList", userBiz.findByRole("agent"));
         return "/vm/agent/agent_update";
     }
@@ -141,7 +146,8 @@ public Map<String,Object> imp(@RequestParam("file") CommonsMultipartFile file){
 				String agentName = row.getCell(1).getStringCellValue();
 				if(StringUtils.isEmpty(agentName)) continue;
 				String area = row.getCell(2).getStringCellValue();
-				Agent agent = new Agent(agentLevel,agentName,area);
+				String openid = row.getCell(3).getStringCellValue();
+				Agent agent = new Agent(agentLevel,agentName,area,openid);
 				
 				agentBiz.add(agent);
 			}
diff --git a/src/main/java/com/vm/controller/AreaController.java b/src/main/java/com/vm/controller/AreaController.java
new file mode 100644
index 0000000..3a963dd
--- /dev/null
+++ b/src/main/java/com/vm/controller/AreaController.java
@@ -0,0 +1,76 @@
+package com.vm.controller;
+
+import java.util.List;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.entity.Area;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.vm.service.AreaBiz;
+
+@Controller
+@RequestMapping("area.do")
+public class AreaController {
+
+    @Autowired
+    private AreaBiz areaBiz;
+    
+    @RequiresPermissions("area:query")
+    @RequestMapping("area.view")
+    public String areaView(Model model) {
+        return "forward:/area.do/area.view/0/10";
+    }
+
+    @RequiresPermissions("area:query")
+    @RequestMapping("area.view/{pageNum}/{pageSize}")
+    public String areaView(Area area,Model m,@PathVariable("pageNum") int pageNum,
+    		@PathVariable("pageSize") int pageSize) {
+    	PageHelper.startPage(pageNum, pageSize);
+    	List<Area> list =  areaBiz.find(area);
+    	PageInfo<Area> page = new PageInfo<Area>(list);
+        m.addAttribute("areaList", list);
+        m.addAttribute("page", page);
+        return "/vm/area/area";
+    }
+
+    @RequiresPermissions("area:add")
+    @RequestMapping("area_add.view")
+    public String areaAddView(Model m) {
+    	m.addAttribute("area", new Area());
+        return "/vm/area/area_add";
+    }
+
+    @RequiresPermissions("area:update")
+    @RequestMapping("area_update.view")
+    public String areaUpdateView(Long id,Model m) {
+    	m.addAttribute("area",areaBiz.findById(id));
+        return "/vm/area/area_update";
+    }
+
+    @RequiresPermissions("area:add")
+    @RequestMapping("add")
+    public String add(Area area) {
+        areaBiz.add(area);
+        return "redirect:/area.do/area.view";
+    }
+
+    @RequiresPermissions("area:update")
+    @RequestMapping("update")
+    public String update(Area area) {
+        areaBiz.update(area);
+        return "redirect:/area.do/area.view";
+    }
+
+    @RequiresPermissions("area:delete")
+    @RequestMapping("delete")
+    public String delete(Long id) {
+        areaBiz.delete(id);
+        return "redirect:/area.do/area.view";
+    }
+}
diff --git a/src/main/java/com/vm/controller/OrderController.java b/src/main/java/com/vm/controller/OrderController.java
new file mode 100644
index 0000000..f4902aa
--- /dev/null
+++ b/src/main/java/com/vm/controller/OrderController.java
@@ -0,0 +1,173 @@
+package com.vm.controller;
+
+import java.beans.PropertyEditorSupport;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.ui.Model;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.InitBinder;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+
+import com.entity.Agent;
+import com.entity.Car;
+import com.entity.Order;
+import com.entity.enumeration.OrderType;
+import com.entity.enumeration.Status;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.util.ResultMapUtil;
+import com.vm.service.AgentBiz;
+import com.vm.service.CarBiz;
+import com.vm.service.OrderBiz;
+
+@Controller
+@RequestMapping("order.do")
+public class OrderController {
+	private Logger log = Logger.getLogger(OrderController.class);
+
+    @Autowired
+    private OrderBiz orderBiz;
+    @Autowired
+    private CarBiz carBiz;
+    @Autowired
+    private AgentBiz agentBiz;
+    
+    
+    @InitBinder    
+    protected void initBinder(WebDataBinder binder) {
+    	binder.registerCustomEditor(OrderType.class, new PropertyEditorSupport(){
+    		@Override  
+		    public void setAsText(String text) throws IllegalArgumentException {  
+    			if(!StringUtils.isEmpty(text))
+    				this.setValue(OrderType.valueOf(text));  
+		    }  
+		    @Override  
+		    public String getAsText() {  
+		    	OrderType value = (OrderType)this.getValue();  
+		        return value.name();  
+		    }  
+    	});
+    }
+    
+    @RequiresPermissions("order:query")
+    @RequestMapping("order.view")
+    public String orderView(Model model) {
+        return "forward:/order.do/order.view/0/10";
+    }
+
+    @RequiresPermissions("order:query")
+    @RequestMapping("order.view/{pageNum}/{pageSize}")
+    public String orderView(Order order,Model m,@PathVariable("pageNum") int pageNum,
+    		@PathVariable("pageSize") int pageSize) {
+    	PageHelper.startPage(pageNum, pageSize);
+    	List<Order> list =  orderBiz.find(order);
+    	PageInfo<Order> page = new PageInfo<Order>(list);
+        m.addAttribute("orderList", list);
+        m.addAttribute("page", page);
+        return "/vm/order/order";
+    }
+
+    @RequestMapping("external/order_add.view")
+    public String orderAddView(ModelMap m) {
+    	String openid = (String) m.get("openid");
+    	String orderType = (String) m.get("orderType");
+    	if(StringUtils.isEmpty(openid)) {
+    		openid = "test";
+    		m.put("openid", openid);
+    	}
+    	if(StringUtils.isEmpty(orderType)) {
+    		orderType = OrderType.DISTRIBUTION.name();
+    		m.put("orderType", orderType);
+    	}
+    	Agent agent = agentBiz.findByOpenId(openid);
+    	List<Car> carList = carBiz.findByLevel(agent.getLevel());
+    	m.put("carList", carList);
+        return "/vm/order/external_order_add";
+    }
+
+    @RequestMapping("external/add")
+    public String add(Order order) {
+    	order.setStatus(Status.START);
+    	orderBiz.add(order);
+    	return "/vm/order/external_order_add_success";
+    }
+    
+    @RequiresPermissions("order:update")
+    @RequestMapping("order_update.view")
+    public String orderUpdateView(Long id,Model m) {
+    	m.addAttribute("order",orderBiz.findById(id));
+        return "/vm/order/order_update";
+    }
+
+
+    @RequiresPermissions("order:update")
+    @RequestMapping("update")
+    public String update(Order order) {
+        orderBiz.update(order);
+        return "redirect:/order.do/order.view";
+    }
+
+    @RequiresPermissions("order:delete")
+    @RequestMapping("delete")
+    public String delete(Long id) {
+        orderBiz.delete(id);
+        return "redirect:/order.do/order.view";
+    }
+    
+    
+    @SuppressWarnings("resource")
+	@RequiresPermissions("order:import")
+    @RequestMapping("import")
+    @ResponseBody
+    @Transactional()
+    public Map<String,Object> imp(@RequestParam("file") CommonsMultipartFile file){
+    	Workbook wb = null;
+    	try {
+    		boolean isExcel2007 = file.getOriginalFilename().matches("^.+\\.(?i)(xlsx)$");  
+    		if(isExcel2007) {
+    			wb = new XSSFWorkbook(file.getInputStream());  
+    		} else {
+    			wb = new HSSFWorkbook(file.getInputStream());  
+    		}
+			Sheet sheet = wb.getSheetAt(0);   
+			int rowNum = sheet.getLastRowNum();
+			for(int i=1;i<=rowNum;i++) {
+				Row row = sheet.getRow(i);
+				String level = row.getCell(0).getStringCellValue();
+				String orderName = row.getCell(1).getStringCellValue();
+				if(StringUtils.isEmpty(orderName)) continue;
+				String area = row.getCell(2).getStringCellValue();
+				Order order = new Order();
+				
+				orderBiz.add(order);
+			}
+		} catch(NullPointerException e) {
+			log.error("上传文件解析失败",e);
+			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+			return ResultMapUtil.getFailMap("字段不允许为空");
+		} catch (IOException e) {
+			log.error("上传文件解析失败",e);
+			return ResultMapUtil.getFailMap();
+		}
+    	return ResultMapUtil.getSuccessMap();
+    }
+}
diff --git a/src/main/java/com/vm/controller/VendorController.java b/src/main/java/com/vm/controller/VendorController.java
new file mode 100644
index 0000000..bc4de71
--- /dev/null
+++ b/src/main/java/com/vm/controller/VendorController.java
@@ -0,0 +1,76 @@
+package com.vm.controller;
+
+import java.util.List;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.entity.Vendor;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.vm.service.VendorBiz;
+
+@Controller
+@RequestMapping("vendor.do")
+public class VendorController {
+
+    @Autowired
+    private VendorBiz vendorBiz;
+    
+    @RequiresPermissions("vendor:query")
+    @RequestMapping("vendor.view")
+    public String vendorView(Model model) {
+        return "forward:/vendor.do/vendor.view/0/10";
+    }
+
+    @RequiresPermissions("vendor:query")
+    @RequestMapping("vendor.view/{pageNum}/{pageSize}")
+    public String vendorView(Vendor vendor,Model m,@PathVariable("pageNum") int pageNum,
+    		@PathVariable("pageSize") int pageSize) {
+    	PageHelper.startPage(pageNum, pageSize);
+    	List<Vendor> list =  vendorBiz.find(vendor);
+    	PageInfo<Vendor> page = new PageInfo<Vendor>(list);
+        m.addAttribute("vendorList", list);
+        m.addAttribute("page", page);
+        return "/vm/vendor/vendor";
+    }
+
+    @RequiresPermissions("vendor:add")
+    @RequestMapping("vendor_add.view")
+    public String vendorAddView(Model m) {
+    	m.addAttribute("vendor", new Vendor());
+        return "/vm/vendor/vendor_add";
+    }
+
+    @RequiresPermissions("vendor:update")
+    @RequestMapping("vendor_update.view")
+    public String vendorUpdateView(Long id,Model m) {
+    	m.addAttribute("vendor",vendorBiz.findById(id));
+        return "/vm/vendor/vendor_update";
+    }
+
+    @RequiresPermissions("vendor:add")
+    @RequestMapping("add")
+    public String add(Vendor vendor) {
+        vendorBiz.add(vendor);
+        return "redirect:/vendor.do/vendor.view";
+    }
+
+    @RequiresPermissions("vendor:update")
+    @RequestMapping("update")
+    public String update(Vendor vendor) {
+        vendorBiz.update(vendor);
+        return "redirect:/vendor.do/vendor.view";
+    }
+
+    @RequiresPermissions("vendor:delete")
+    @RequestMapping("delete")
+    public String delete(Long id) {
+        vendorBiz.delete(id);
+        return "redirect:/vendor.do/vendor.view";
+    }
+}
diff --git a/src/main/java/com/vm/dao/AgentDao.java b/src/main/java/com/vm/dao/AgentDao.java
index 07b8db7..819f364 100644
--- a/src/main/java/com/vm/dao/AgentDao.java
+++ b/src/main/java/com/vm/dao/AgentDao.java
@@ -15,4 +15,5 @@ public interface AgentDao {
 
     public void delete(Long id);
 
+	public Agent findByOpenId(String id);
 }
diff --git a/src/main/java/com/vm/dao/AreaDao.java b/src/main/java/com/vm/dao/AreaDao.java
new file mode 100644
index 0000000..1da5720
--- /dev/null
+++ b/src/main/java/com/vm/dao/AreaDao.java
@@ -0,0 +1,17 @@
+package com.vm.dao;
+
+import java.util.List;
+
+import com.entity.Area;
+
+public interface AreaDao {
+    public List<Area> find(Area area);
+    
+    public Area findById(Long id);
+
+    public void add(Area area);
+
+    public void update(Area area);
+
+    public void delete(Long id);
+}
diff --git a/src/main/java/com/vm/dao/OrderDao.java b/src/main/java/com/vm/dao/OrderDao.java
new file mode 100644
index 0000000..8c43bf7
--- /dev/null
+++ b/src/main/java/com/vm/dao/OrderDao.java
@@ -0,0 +1,18 @@
+package com.vm.dao;
+
+import java.util.List;
+
+import com.entity.Order;
+
+public interface OrderDao {
+    public List<Order> find(Order order);
+    
+    public Order findById(Long id);
+
+    public void add(Order order);
+
+    public void update(Order order);
+
+    public void delete(Long id);
+
+}
diff --git a/src/main/java/com/vm/dao/VendorDao.java b/src/main/java/com/vm/dao/VendorDao.java
new file mode 100644
index 0000000..a62b78c
--- /dev/null
+++ b/src/main/java/com/vm/dao/VendorDao.java
@@ -0,0 +1,17 @@
+package com.vm.dao;
+
+import java.util.List;
+
+import com.entity.Vendor;
+
+public interface VendorDao {
+    public List<Vendor> find(Vendor vendor);
+    
+    public Vendor findById(Long id);
+
+    public void add(Vendor vendor);
+
+    public void update(Vendor vendor);
+
+    public void delete(Long id);
+}
diff --git a/src/main/java/com/vm/service/AgentBiz.java b/src/main/java/com/vm/service/AgentBiz.java
index 4559df1..a4a065e 100644
--- a/src/main/java/com/vm/service/AgentBiz.java
+++ b/src/main/java/com/vm/service/AgentBiz.java
@@ -14,6 +14,6 @@ public interface AgentBiz {
     public void delete(Long id);
 
 	public Agent findById(Long id);
-
-
+	
+	public Agent findByOpenId(String id);
 }
diff --git a/src/main/java/com/vm/service/AreaBiz.java b/src/main/java/com/vm/service/AreaBiz.java
new file mode 100644
index 0000000..276bf4b
--- /dev/null
+++ b/src/main/java/com/vm/service/AreaBiz.java
@@ -0,0 +1,17 @@
+package com.vm.service;
+
+import java.util.List;
+
+import com.entity.Area;
+
+public interface AreaBiz {
+	public List<Area> find(Area area);
+
+    public void add(Area area);
+
+    public void update(Area area);
+
+    public void delete(Long id);
+
+	public Area findById(Long id);
+}
diff --git a/src/main/java/com/vm/service/CarBiz.java b/src/main/java/com/vm/service/CarBiz.java
index 28a0905..484cd83 100644
--- a/src/main/java/com/vm/service/CarBiz.java
+++ b/src/main/java/com/vm/service/CarBiz.java
@@ -3,6 +3,7 @@
 import java.util.List;
 
 import com.entity.Car;
+import com.entity.enumeration.AgentLevel;
 
 public interface CarBiz {
 	public List<Car> find(Car car);
@@ -15,5 +16,5 @@ public interface CarBiz {
 
 	public Car findById(Long id);
 
-
+	public List<Car> findByLevel(AgentLevel level);
 }
diff --git a/src/main/java/com/vm/service/OrderBiz.java b/src/main/java/com/vm/service/OrderBiz.java
new file mode 100644
index 0000000..19e6226
--- /dev/null
+++ b/src/main/java/com/vm/service/OrderBiz.java
@@ -0,0 +1,19 @@
+package com.vm.service;
+
+import java.util.List;
+
+import com.entity.Order;
+
+public interface OrderBiz {
+	public List<Order> find(Order order);
+
+    public void add(Order order);
+
+    public void update(Order order);
+
+    public void delete(Long id);
+
+	public Order findById(Long id);
+
+
+}
diff --git a/src/main/java/com/vm/service/VendorBiz.java b/src/main/java/com/vm/service/VendorBiz.java
new file mode 100644
index 0000000..8d8cba6
--- /dev/null
+++ b/src/main/java/com/vm/service/VendorBiz.java
@@ -0,0 +1,17 @@
+package com.vm.service;
+
+import java.util.List;
+
+import com.entity.Vendor;
+
+public interface VendorBiz {
+	public List<Vendor> find(Vendor vendor);
+
+    public void add(Vendor vendor);
+
+    public void update(Vendor vendor);
+
+    public void delete(Long id);
+
+	public Vendor findById(Long vendor);
+}
diff --git a/src/main/java/com/vm/service/impl/AgentBizImpl.java b/src/main/java/com/vm/service/impl/AgentBizImpl.java
index f86ef60..2eeeb68 100644
--- a/src/main/java/com/vm/service/impl/AgentBizImpl.java
+++ b/src/main/java/com/vm/service/impl/AgentBizImpl.java
@@ -39,6 +39,11 @@ public Agent findById(Long id) {
 		return AgentDao.findById(id);
 	}
 
+	@Override
+	public Agent findByOpenId(String id) {
+		return AgentDao.findByOpenId(id);
+	}
+
 	public void add(Agent agent) {
         AgentDao.add(agent);
     }
diff --git a/src/main/java/com/vm/service/impl/AreaBizImpl.java b/src/main/java/com/vm/service/impl/AreaBizImpl.java
new file mode 100644
index 0000000..5bded8e
--- /dev/null
+++ b/src/main/java/com/vm/service/impl/AreaBizImpl.java
@@ -0,0 +1,38 @@
+package com.vm.service.impl;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.entity.Area;
+import com.vm.dao.AreaDao;
+import com.vm.service.AreaBiz;
+
+@Service
+public class AreaBizImpl implements AreaBiz {
+    @Resource
+    private AreaDao areaDao;
+
+    public List<Area> find(Area area) {
+        return areaDao.find(area);
+    }
+
+    @Override
+	public Area findById(Long id) {
+		return areaDao.findById(id);
+	}
+
+	public void add(Area area) {
+        areaDao.add(area);
+    }
+
+    public void update(Area area) {
+        areaDao.update(area);
+    }
+
+    public void delete(Long areaId) {
+        areaDao.delete(areaId);
+    }
+}
diff --git a/src/main/java/com/vm/service/impl/CarBizImpl.java b/src/main/java/com/vm/service/impl/CarBizImpl.java
index 94ad2ee..b0abb5f 100644
--- a/src/main/java/com/vm/service/impl/CarBizImpl.java
+++ b/src/main/java/com/vm/service/impl/CarBizImpl.java
@@ -7,6 +7,7 @@
 import org.springframework.stereotype.Service;
 
 import com.entity.Car;
+import com.entity.enumeration.AgentLevel;
 import com.vm.dao.CarDao;
 import com.vm.service.CarBiz;
 
@@ -20,6 +21,12 @@ public List<Car> find(Car car) {
     }
 
     @Override
+	public List<Car> findByLevel(AgentLevel level) {
+    	//TODO 根据客户等级查询车辆
+    	return carDao.find(new Car());
+	}
+
+	@Override
 	public Car findById(Long id) {
 		return carDao.findById(id);
 	}
diff --git a/src/main/java/com/vm/service/impl/OrderBizImpl.java b/src/main/java/com/vm/service/impl/OrderBizImpl.java
new file mode 100644
index 0000000..b50673e
--- /dev/null
+++ b/src/main/java/com/vm/service/impl/OrderBizImpl.java
@@ -0,0 +1,37 @@
+package com.vm.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.entity.Order;
+import com.vm.dao.OrderDao;
+import com.vm.service.OrderBiz;
+
+@Service
+public class OrderBizImpl implements OrderBiz {
+    @Autowired
+    private OrderDao orderDao;
+
+    public List<Order> find(Order order) {
+    	return orderDao.find(order);
+    }
+
+	public Order findById(Long id) {
+		return orderDao.findById(id);
+	}
+
+	public void add(Order order) {
+        orderDao.add(order);
+    }
+
+    public void update(Order order) {
+        orderDao.update(order);
+    }
+
+    public void delete(Long orderId) {
+        orderDao.delete(orderId);
+    }
+
+}
diff --git a/src/main/java/com/vm/service/impl/StandardBizImpl.java b/src/main/java/com/vm/service/impl/StandardBizImpl.java
index 0cc5214..35fb640 100644
--- a/src/main/java/com/vm/service/impl/StandardBizImpl.java
+++ b/src/main/java/com/vm/service/impl/StandardBizImpl.java
@@ -10,10 +10,6 @@
 import com.vm.dao.StandardDao;
 import com.vm.service.StandardBiz;
 
-/**
- * Created by c0de8ug on 16-2-11.
- */
-
 @Service
 public class StandardBizImpl implements StandardBiz {
     @Resource
diff --git a/src/main/java/com/vm/service/impl/VendorBizImpl.java b/src/main/java/com/vm/service/impl/VendorBizImpl.java
new file mode 100644
index 0000000..6c76d35
--- /dev/null
+++ b/src/main/java/com/vm/service/impl/VendorBizImpl.java
@@ -0,0 +1,38 @@
+package com.vm.service.impl;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.entity.Vendor;
+import com.vm.dao.VendorDao;
+import com.vm.service.VendorBiz;
+
+@Service
+public class VendorBizImpl implements VendorBiz {
+    @Resource
+    private VendorDao vendorDao;
+
+    public List<Vendor> find(Vendor vendor) {
+        return vendorDao.find(vendor);
+    }
+
+    @Override
+	public Vendor findById(Long id) {
+		return vendorDao.findById(id);
+	}
+
+	public void add(Vendor vendor) {
+        vendorDao.add(vendor);
+    }
+
+    public void update(Vendor vendor) {
+        vendorDao.update(vendor);
+    }
+
+    public void delete(Long vendorId) {
+        vendorDao.delete(vendorId);
+    }
+}
diff --git a/src/main/resources/breadcrumb-e-c.properties b/src/main/resources/breadcrumb-e-c.properties
index c11d072..53f68b9 100644
--- a/src/main/resources/breadcrumb-e-c.properties
+++ b/src/main/resources/breadcrumb-e-c.properties
@@ -8,3 +8,5 @@ resource=\u6743\u9650
 user=\u7528\u6237
 standard=\u89C4\u683C
 agent=\u4EE3\u7406\u5546
+vendor=\u5382\u5546
+area=\u533A\u57DF
diff --git a/src/main/resources/db.properties b/src/main/resources/db.properties
index 4625c71..38d320a 100644
--- a/src/main/resources/db.properties
+++ b/src/main/resources/db.properties
@@ -1,4 +1,8 @@
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://rm-uf6ggkftngujcn480o.mysql.rds.aliyuncs.com:3306/car_sale_sh
-jdbc.password=root_123
-jdbc.username=root
+#jdbc.url=jdbc:mysql://rm-uf6ggkftngujcn480o.mysql.rds.aliyuncs.com:3306/car_sale_sh
+#jdbc.password=root_123
+#jdbc.username=root
+
+jdbc.url=jdbc:mysql://localhost:3306/vehicle?characterEncoding=utf8&useSSL=false
+jdbc.password=root
+jdbc.username=root
\ No newline at end of file
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
index ff1028a..9a5d202 100644
--- a/src/main/resources/log4j.properties
+++ b/src/main/resources/log4j.properties
@@ -1,4 +1,4 @@
-log4j.rootLogger = debug , stdout
+log4j.rootLogger = debug , stdout ,consoleAppender
 
 ###  output to the console ###
 log4j.appender.stdout = org.apache.log4j.ConsoleAppender
@@ -6,6 +6,7 @@ log4j.appender.stdout.Target = System.out
 log4j.appender.stdout.layout = org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss} [%c]-[%p] %m%n
 
+log4j.appender.consoleAppender.layout.ConversionPattern=ProcessDefinitionId=%X{mdcProcessDefinitionID} executionId=%X{mdcExecutionId} mdcProcessInstanceID=%X{mdcProcessInstanceID} mdcBusinessKey=%X{mdcBusinessKey} %m%n
 
 #mybatis
 log4j.logger.org.apache.ibatis=info
diff --git a/src/main/resources/mapper/AgentDao.xml b/src/main/resources/mapper/AgentDao.xml
index b2439b6..4bc35e9 100644
--- a/src/main/resources/mapper/AgentDao.xml
+++ b/src/main/resources/mapper/AgentDao.xml
@@ -8,6 +8,7 @@
 
     <resultMap id="agent_map" type="Agent">
         <id property="id" column="id"/>
+        <result property="openid" column="openid"/>
         <result property="level" column="level"/>
         <result property="agentName" column="agent_name"/>
         <result property="userIdsStr" column="user_ids"/>
@@ -33,10 +34,17 @@
     <select id="findById" parameterType="long" resultMap="agent_map">
         SELECT * FROM agent WHERE id = #{value}
     </select>
+    
+    <select id="findByOpenId" parameterType="string" resultMap="agent_map">
+        SELECT * FROM agent WHERE openid = #{openid}
+    </select>
 
     <update id="update" parameterType="Agent">
         UPDATE agent 
         <set>
+        	<if test="openid!=null and openid!=''">
+        		openid=#{openid},
+        	</if>
         	<if test="level!=null">
         		level=#{level},
         	</if>
@@ -54,7 +62,7 @@
     </update>
 
     <insert id="add" parameterType="Agent">
-        INSERT INTO agent(level,agent_name,user_ids,area) VALUES(#{level},#{agentName},#{userIdsStr},#{area})
+        INSERT INTO agent(openid,level,agent_name,user_ids,area) VALUES(#{openid},#{level},#{agentName},#{userIdsStr},#{area})
     </insert>
 
     <delete id="delete" parameterType="long">
diff --git a/src/main/resources/mapper/AreaDao.xml b/src/main/resources/mapper/AreaDao.xml
new file mode 100644
index 0000000..5d1ab34
--- /dev/null
+++ b/src/main/resources/mapper/AreaDao.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+
+<mapper namespace="com.vm.dao.AreaDao">
+
+    <resultMap id="area_map" type="Area">
+        <id property="id" column="id"/>
+        <result property="area" column="area"/>
+    </resultMap>
+
+
+    <select id="find" resultMap="area_map" parameterType="Area">
+        SELECT * FROM area
+        <where>
+        	<if test="area != null and area != ''">
+        		area like concat('%',#{area},'%')
+        	</if>
+        </where>
+    </select>
+
+    <select id="findById" parameterType="long" resultMap="area_map">
+        SELECT * FROM area WHERE id = #{value}
+    </select>
+
+    <update id="update" parameterType="Area">
+        UPDATE area 
+        <set>
+        	<if test="area != null and area != ''">
+        		area = #{area},
+        	</if>
+        </set>
+        WHERE id = #{id}
+    </update>
+
+    <insert id="add" parameterType="area">
+        INSERT INTO area(area) VALUES(#{area})
+    </insert>
+
+    <delete id="delete" parameterType="long">
+        DELETE FROM area WHERE id = #{id}
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/OrderDao.xml b/src/main/resources/mapper/OrderDao.xml
new file mode 100644
index 0000000..2248e2d
--- /dev/null
+++ b/src/main/resources/mapper/OrderDao.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+
+<mapper namespace="com.vm.dao.OrderDao">
+
+    <resultMap id="order_map" type="Order">
+        <id property="id" column="id"/>
+        <result property="openid" column="openid"/>
+        <result property="carId" column="car_id"/>
+        <result property="carCnt" column="car_cnt"/>
+        <result property="price" column="price"/>
+        <result property="status" column="status" typeHandler="org.apache.ibatis.type.EnumOrdinalTypeHandler"/>
+        <result property="orderType" column="order_type" typeHandler="org.apache.ibatis.type.EnumOrdinalTypeHandler"/>
+        <result property="startTime" column="start_time"/>
+        <result property="deliverTime" column="deliver_time"/>
+    </resultMap>
+
+
+    <select id="find" resultMap="order_map" parameterType="Order">
+        SELECT * FROM `order`
+    </select>
+
+    <select id="findById" parameterType="long" resultMap="order_map">
+        SELECT * FROM `order` WHERE id = #{value}
+    </select>
+    
+    <select id="findByOpenId" parameterType="string" resultMap="order_map">
+        SELECT * FROM `order` WHERE openid = #{openid}
+    </select>
+
+    <update id="update" parameterType="order">
+        UPDATE `order`
+        <set>
+        	<if test="openid!=null and openid!=''">
+        		openid=#{openid},
+        	</if>
+        </set>
+        WHERE id = #{id}
+    </update>
+	
+    <insert id="add" parameterType="Order">
+        INSERT INTO `order`(openid,car_Id,car_cnt,price,status,order_type,start_time) 
+        VALUES(#{openid},#{carId},#{carCnt},#{price},
+        #{status,typeHandler=org.apache.ibatis.type.EnumOrdinalTypeHandler},
+        #{orderType,typeHandler=org.apache.ibatis.type.EnumOrdinalTypeHandler},
+        now())
+    </insert>
+
+    <delete id="delete" parameterType="long">
+        DELETE FROM `order` WHERE id = #{id}
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/VendorDao.xml b/src/main/resources/mapper/VendorDao.xml
new file mode 100644
index 0000000..be8c3d3
--- /dev/null
+++ b/src/main/resources/mapper/VendorDao.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+
+<mapper namespace="com.vm.dao.VendorDao">
+
+    <resultMap id="vendor_map" type="Vendor">
+        <id property="id" column="id"/>
+        <result property="vendorName" column="vendor_name"/>
+        <result property="contact" column="contact"/>
+        <result property="url" column="url"/>
+        <result property="address" column="address"/>
+        <result property="telephone" column="telephone"/>
+        <result property="phone" column="phone"/>
+        <result property="email" column="email"/>
+        <result property="attachId" column="attach_id"/>
+    </resultMap>
+
+
+    <select id="find" resultMap="vendor_map" parameterType="Vendor">
+        SELECT * FROM vendor
+        <where>
+        	<if test="vendorName != null and vendorName != ''">
+        		vendor_name like concat('%',#{vendorName},'%')
+        	</if>
+        </where>
+    </select>
+
+    <select id="findById" parameterType="long" resultMap="vendor_map">
+        SELECT * FROM vendor WHERE id = #{value}
+    </select>
+
+    <update id="update" parameterType="vendor">
+        UPDATE vendor 
+        <set>
+        	<if test="vendorName != null and vendorName != ''">
+        		vendor_name = #{vendorName},
+        	</if>
+        	<if test="contact != null and contact != ''">
+        		contact = #{contact},
+        	</if>
+        	<if test="url != null and url != ''">
+        		url = #{url},
+        	</if>
+        	<if test="address != null and address != ''">
+        		address = #{address},
+        	</if>
+        	<if test="telephone != null and telephone != ''">
+        		telephone = #{telephone},
+        	</if>
+        	<if test="phone != null and phone != ''">
+        		phone = #{phone},
+        	</if>
+        	<if test="email != null and email != ''">
+        		email = #{email},
+        	</if>
+        	<if test="attachId != null">
+        		attach_id = #{attachId},
+        	</if>
+        </set>
+        WHERE id = #{id}
+    </update>
+
+    <insert id="add" parameterType="Vendor">
+        INSERT INTO vendor(vendor_name,contact,url,address,telephone,phone,email,attach_id) 
+        VALUES(#{vendorName},#{contact},#{url},#{address},#{telephone},#{phone},#{email},#{attachId})
+    </insert>
+
+    <delete id="delete" parameterType="long">
+        DELETE FROM vendor WHERE id = #{id}
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis-config.xml b/src/main/resources/spring/mybatis-config.xml
similarity index 88%
rename from src/main/resources/mybatis-config.xml
rename to src/main/resources/spring/mybatis-config.xml
index 55dab44..fec7c5d 100644
--- a/src/main/resources/mybatis-config.xml
+++ b/src/main/resources/spring/mybatis-config.xml
@@ -8,6 +8,10 @@
 	<settings>  
         <setting name="logImpl" value="LOG4J"/>  
     </settings>  
+    <typeHandlers>
+    	<typeHandler handler="org.apache.ibatis.type.EnumOrdinalTypeHandler" javaType="com.entity.enumeration.OrderType"/>
+    	<typeHandler handler="org.apache.ibatis.type.EnumOrdinalTypeHandler" javaType="com.entity.enumeration.Status"/>
+    </typeHandlers>
     <!-- 插件配置 -->
     <plugins>  
         <!-- com.github.pagehelper为PageHelper类所在包名 -->  
diff --git a/src/main/resources/spring-mvc-shiro.xml b/src/main/resources/spring/spring-mvc-shiro.xml
similarity index 98%
rename from src/main/resources/spring-mvc-shiro.xml
rename to src/main/resources/spring/spring-mvc-shiro.xml
index 212e848..b62c891 100644
--- a/src/main/resources/spring-mvc-shiro.xml
+++ b/src/main/resources/spring/spring-mvc-shiro.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:aop="http://www.springframework.org/schema/aop"
-       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
-       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd">
-
-    <!--&lt;!&ndash;shiro的注解驱动&ndash;&gt;-->
-    <aop:config proxy-target-class="true"></aop:config>
-    <bean class="org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor">
-        <property name="securityManager" ref="securityManager"/>
-    </bean>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       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
+       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd">
+
+    <!--&lt;!&ndash;shiro的注解驱动&ndash;&gt;-->
+    <aop:config proxy-target-class="true"></aop:config>
+    <bean class="org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor">
+        <property name="securityManager" ref="securityManager"/>
+    </bean>
+
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/spring-mvc.xml b/src/main/resources/spring/spring-mvc.xml
similarity index 96%
rename from src/main/resources/spring-mvc.xml
rename to src/main/resources/spring/spring-mvc.xml
index 8aea47e..07e554d 100644
--- a/src/main/resources/spring-mvc.xml
+++ b/src/main/resources/spring/spring-mvc.xml
@@ -68,6 +68,6 @@
     <!--第三种静态资源映射-->
     <!--<mvc:resources mapping="/static/**" location="/WEB-INF/static/"/>-->
 
-    <import resource="classpath:spring-mvc-shiro.xml"/>
+    <import resource="classpath:spring/spring-mvc-shiro.xml"/>
 
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/spring-shiro.xml b/src/main/resources/spring/spring-shiro.xml
similarity index 95%
rename from src/main/resources/spring-shiro.xml
rename to src/main/resources/spring/spring-shiro.xml
index 9a4fe14..fde8ca3 100644
--- a/src/main/resources/spring-shiro.xml
+++ b/src/main/resources/spring/spring-shiro.xml
@@ -56,13 +56,15 @@
         </property>
         <property name="filterChainDefinitions">
             <value>
+            	/**/external/** = anon
             	/**/import = anon
                 /login.jsp = anon
-                /logout = logout
                 /dist/** = anon
                 /img/** = anon
+                /css/** = anon
                 /js/** = anon
                 /bower_components/** = anon
+                /logout = logout
                 /** = authc
             </value>
         </property>
diff --git a/src/main/resources/spring.xml b/src/main/resources/spring/spring.xml
similarity index 93%
rename from src/main/resources/spring.xml
rename to src/main/resources/spring/spring.xml
index 57c4cb5..46ff119 100644
--- a/src/main/resources/spring.xml
+++ b/src/main/resources/spring/spring.xml
@@ -42,7 +42,7 @@
 
 	<!--mybatis的SqlSessionFactoy配置 -->
 	<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-		<property name="configLocation" value="classpath:mybatis-config.xml" />
+		<property name="configLocation" value="classpath:spring/mybatis-config.xml" />
 		<property name="dataSource" ref="dataSource" />
 		<property name="typeAliasesPackage"
 			value="com.entity,com.entity.custom" />
@@ -67,5 +67,5 @@
 	<bean id="exceptionHandlerExceptionResolver" class="com.exception.DefaultExceptionHandler">
 	</bean>
 
-	<import resource="classpath:spring-shiro.xml" />
+	<import resource="classpath:spring/spring-shiro.xml" />
 </beans>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/view/admin/nav.jsp b/src/main/webapp/WEB-INF/view/admin/nav.jsp
index 7b13632..f7d6c6f 100644
--- a/src/main/webapp/WEB-INF/view/admin/nav.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/nav.jsp
@@ -123,6 +123,16 @@
                                 <a href="${pageContext.request.contextPath}/agent.do/agent.view"> 代理商管理</a>
                             </li>
                         	</shiro:hasPermission>
+                        	<shiro:hasPermission name="vendor">
+                            <li>
+                                <a href="${pageContext.request.contextPath}/vendor.do/vendor.view"> 厂商管理</a>
+                            </li>
+                        	</shiro:hasPermission>
+                        	<shiro:hasPermission name="area">
+                            <li>
+                                <a href="${pageContext.request.contextPath}/area.do/area.view"> 区域管理</a>
+                            </li>
+                        	</shiro:hasPermission>
                         </ul>
                         <!-- /.nav-second-level -->
                     </li>
diff --git a/src/main/webapp/WEB-INF/view/vm/agent/agent.jsp b/src/main/webapp/WEB-INF/view/vm/agent/agent.jsp
index 0f12f6b..baa85d9 100644
--- a/src/main/webapp/WEB-INF/view/vm/agent/agent.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/agent/agent.jsp
@@ -1,102 +1,104 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://www.springframework.org/tags/form"  prefix="form"%>
-<jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
-<!-- Page Content -->
-<div id="page-wrapper">
-    <div class="container-fluid">
-    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
-        <div class="panel-heading">
-        </div>
-        <div class="row">
-            <div class="col-lg-12">
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        代理商信息
-                    </div>
-                    <!-- /.panel-heading -->
-                    <div class="panel-body">
-                        <div class="dataTable_wrapper">
-                        	<form:form cssClass="searchForm form-horizontal" commandName="agent" action="${pageContext.request.contextPath}/agent.do/agent.view/" method="post">
-                        		<button type="button" class="btn btn-default pull-right" id="toggle-advanced-search">查询条件<i class="fa fa-angle-double-down"></i></button>
-                        		<div class="clearfix"></div>
-                        		<div class="row-fluid" id="div-advanced-search" style="display:none;">
-                        		<div class="form-group">
-                        			<label class="col-sm-1 control-label">级别</label>
-	                                <div class="col-sm-2">
-	                                	<select name="level" class="form-control">
-                                			<option></option>
-	                                		<c:forEach items="${agentLevel }" var="entry">
-	                                			<option value="${entry.name() }" <c:if test="${agent.level==entry }">selected</c:if>>${entry.getName() }</option>
-	                                		</c:forEach>
-	                                	</select>
-	                                </div>
-                        			<label class="col-sm-1 control-label">名称</label>
-	                                <div class="col-sm-2">
-	                                	<form:input path="agentName" cssClass="form-control"/>
-	                                </div>
-                        			<label class="col-sm-1 control-label">区域</label>
-	                                <div class="col-sm-2">
-	                                	<form:input path="area" cssClass="form-control"/>
-	                                </div>
-                        		</div>
-                                </div>
-                                <div class="form-group">
-                                	<div class="col-sm-2">
-                                		<a href="${pageContext.request.contextPath}/agent.do/agent_add.view" class="btn btn-primary" role="button">新增</a>
-                                		<button type="button" class="btn btn-primary" onclick="uploader.uploadModal('${pageContext.request.contextPath}/agent.do/import','${pageContext.request.contextPath}/template/agent_tpl.xlsx')">批量上传</button>
-                                	</div>
-                                	<label class="col-sm-8 control-label"></label>
-                                	<div id="searchBtns" style="display:none;">
-                                	<div class="col-sm-1">
-                                		<button type="button" class="btn btn-primary form-control searchBtn">查询</button>
-                                	</div>
-                                	<div class="col-sm-1">
-                                		<button type="reset" class="btn btn-primary form-control">重置</button>
-                                	</div>
-                                	</div>
-                                </div>
-                            <table class="table table-striped table-bordered table-hover" id="dataTables-example">
-                                <thead>
-                                <tr>
-                                    <th>级别</th>
-                                    <th>名称</th>
-                                    <th>绑定职员</th>
-                                    <th>区域</th>
-                                    <th>操作</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <c:forEach var="agent" items="${agentList}">
-                                    <tr>
-                                        <td>${agent.level.getName()}</td>
-                                        <td>${agent.agentName}</td>
-                                        <td>${agent.usernames}</td>
-                                        <td>${agent.area}</td>
-                                        <td>
-                                            <a href="${pageContext.request.contextPath}/agent.do/agent_update.view?id=${agent.id}">修改</a>
-                                            <a href="${pageContext.request.contextPath}/agent.do/delete?id=${agent.id}"
-                                               onclick="return confirm('是否要删除该代理商')">删除</a>
-                                        </td>
-                                    </tr>
-                                </c:forEach>
-                                </tbody>
-                            </table>
-                           <jsp:include page="/WEB-INF/view/admin/pageSplit.jsp"></jsp:include>
-                        </form:form>
-                        </div>
-                        <!-- /.table-responsive -->
-                    </div>
-                    <!-- /.panel-body -->
-                </div>
-                <!-- /.panel -->
-            </div>
-            <!-- /.col-lg-12 -->
-        </div>
-    </div>
-
-    <!-- /.container-fluid -->
-</div>
-
-<jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
-
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://www.springframework.org/tags/form"  prefix="form"%>
+<jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
+<!-- Page Content -->
+<div id="page-wrapper">
+    <div class="container-fluid">
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
+        <div class="panel-heading">
+        </div>
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        代理商信息
+                    </div>
+                    <!-- /.panel-heading -->
+                    <div class="panel-body">
+                        <div class="dataTable_wrapper">
+                        	<form:form cssClass="searchForm form-horizontal" commandName="agent" action="${pageContext.request.contextPath}/agent.do/agent.view/" method="post">
+                        		<button type="button" class="btn btn-default pull-right" id="toggle-advanced-search">查询条件<i class="fa fa-angle-double-down"></i></button>
+                        		<div class="clearfix"></div>
+                        		<div class="row-fluid" id="div-advanced-search" style="display:none;">
+                        		<div class="form-group">
+                        			<label class="col-sm-1 control-label">级别</label>
+	                                <div class="col-sm-2">
+	                                	<select name="level" class="form-control">
+                                			<option></option>
+	                                		<c:forEach items="${agentLevel }" var="entry">
+	                                			<option value="${entry.name() }" <c:if test="${agent.level==entry }">selected</c:if>>${entry.getName() }</option>
+	                                		</c:forEach>
+	                                	</select>
+	                                </div>
+                        			<label class="col-sm-1 control-label">名称</label>
+	                                <div class="col-sm-2">
+	                                	<form:input path="agentName" cssClass="form-control"/>
+	                                </div>
+                        			<label class="col-sm-1 control-label">区域</label>
+	                                <div class="col-sm-2">
+	                                	<form:input path="area" cssClass="form-control"/>
+	                                </div>
+                        		</div>
+                                </div>
+                                <div class="form-group">
+                                	<div class="col-sm-2">
+                                		<a href="${pageContext.request.contextPath}/agent.do/agent_add.view" class="btn btn-primary" role="button">新增</a>
+                                		<button type="button" class="btn btn-primary" onclick="uploader.uploadModal('${pageContext.request.contextPath}/agent.do/import','${pageContext.request.contextPath}/template/agent_tpl.xlsx')">批量上传</button>
+                                	</div>
+                                	<label class="col-sm-8 control-label"></label>
+                                	<div id="searchBtns" style="display:none;">
+                                	<div class="col-sm-1">
+                                		<button type="button" class="btn btn-primary form-control searchBtn">查询</button>
+                                	</div>
+                                	<div class="col-sm-1">
+                                		<button type="reset" class="btn btn-primary form-control">重置</button>
+                                	</div>
+                                	</div>
+                                </div>
+                            <table class="table table-striped table-bordered table-hover" id="dataTables-example">
+                                <thead>
+                                <tr>
+                                    <th>级别</th>
+                                    <th>名称</th>
+                                    <th>绑定职员</th>
+                                    <th>区域</th>
+                                    <th>openid</th>
+                                    <th>操作</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <c:forEach var="agent" items="${agentList}">
+                                    <tr>
+                                        <td>${agent.level.getName()}</td>
+                                        <td>${agent.agentName}</td>
+                                        <td>${agent.usernames}</td>
+                                        <td>${agent.area}</td>
+                                        <td>${agent.openid}</td>
+                                        <td>
+                                            <a href="${pageContext.request.contextPath}/agent.do/agent_update.view?id=${agent.id}">修改</a>
+                                            <a href="${pageContext.request.contextPath}/agent.do/delete?id=${agent.id}"
+                                               onclick="return confirm('是否要删除该代理商')">删除</a>
+                                        </td>
+                                    </tr>
+                                </c:forEach>
+                                </tbody>
+                            </table>
+                           <jsp:include page="/WEB-INF/view/admin/pageSplit.jsp"></jsp:include>
+                        </form:form>
+                        </div>
+                        <!-- /.table-responsive -->
+                    </div>
+                    <!-- /.panel-body -->
+                </div>
+                <!-- /.panel -->
+            </div>
+            <!-- /.col-lg-12 -->
+        </div>
+    </div>
+
+    <!-- /.container-fluid -->
+</div>
+
+<jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
+
diff --git a/src/main/webapp/WEB-INF/view/vm/agent/agent_add.jsp b/src/main/webapp/WEB-INF/view/vm/agent/agent_add.jsp
index 213dc27..57b6332 100644
--- a/src/main/webapp/WEB-INF/view/vm/agent/agent_add.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/agent/agent_add.jsp
@@ -47,7 +47,13 @@
                                 <div class="form-group">
 	                                <label class="col-sm-1 control-label">区域</label>
 	                                <div class="col-sm-11">
-	                                	<form:input path="area" cssClass="form-control"/>
+	                                	<form:select path="area" items="${areaList }" itemValue="area" itemLabel="area" cssClass="selectpicker form-control"/>
+	                                </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">openid</label>
+	                                <div class="col-sm-11">
+	                                	<form:input path="openid" cssClass="form-control"/>
 	                                </div>
                                 </div>
                                 <label></label>
diff --git a/src/main/webapp/WEB-INF/view/vm/agent/agent_update.jsp b/src/main/webapp/WEB-INF/view/vm/agent/agent_update.jsp
index 75ed529..56ecf16 100644
--- a/src/main/webapp/WEB-INF/view/vm/agent/agent_update.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/agent/agent_update.jsp
@@ -1,71 +1,77 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
-<jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
-<!-- Page Content -->
-<div id="page-wrapper">
-    <div class="container-fluid">
-    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
-        <div>
-            <h1 class="page-header">代理商管理</h1>
-        </div>
-        <div class="panel-heading">
-        </div>
-        <div class="row">
-            <div class="col-lg-12">
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        代理商管理
-                    </div>
-                    <!-- /.panel-heading -->
-                    <div class="panel-body">
-                        <div class="dataTable_wrapper">
-                            <form:form action="${pageContext.request.contextPath}/agent.do/update" commandName="agent" method="post" cssClass="form-horizontal">
-                            	<form:hidden path="id"/>
-                            	<div class="form-group">
-	                                <label class="col-sm-1 control-label">代理商级别</label>
-	                                <div class="col-sm-11">
-	                                	<select name="level" class="selectpicker form-control">
-                                			<option></option>
-	                                		<c:forEach items="${agentLevel }" var="entry">
-	                                			<option value="${entry.name() }" <c:if test="${agent.level==entry }">selected</c:if>>${entry.getName() }</option>
-	                                		</c:forEach>
-	                                	</select>
-	                                </div>
-                                </div>
-                                <div class="form-group">
-	                                <label class="col-sm-1 control-label">代理商名称</label>
-	                                <div class="col-sm-11">
-	                                	<form:input path="agentName" cssClass="form-control"/>
-		                             </div>
-                                </div>
-                                <div class="form-group">
-	                                <label class="col-sm-1 control-label">绑定员工</label>
-	                                <div class="col-sm-11">
-	                                	<form:select path="userIds" items="${userList }" itemValue="userId" itemLabel="username" cssClass="selectpicker form-control" multiple="multiple"/>
-	                                </div>
-                                </div>
-                                <div class="form-group">
-	                                <label class="col-sm-1 control-label">区域</label>
-	                                <div class="col-sm-11">
-	                                	<form:input path="area" cssClass="form-control"/>
-	                                </div>
-                                </div>
-                                <label></label>
-                                <button type="submit"
-                                        class="btn btn-primary form-control">修改
-                                </button>
-                            </form:form>
-                        </div>
-                        <!-- /.table-responsive -->
-                    </div>
-                    <!-- /.panel-body -->
-                </div>
-                <!-- /.panel -->
-            </div>
-            <!-- /.col-lg-12 -->
-        </div>
-    </div>
-    <!-- /.container-fluid -->
-</div>
-<jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
+<jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
+<!-- Page Content -->
+<div id="page-wrapper">
+    <div class="container-fluid">
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
+        <div>
+            <h1 class="page-header">代理商管理</h1>
+        </div>
+        <div class="panel-heading">
+        </div>
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        代理商管理
+                    </div>
+                    <!-- /.panel-heading -->
+                    <div class="panel-body">
+                        <div class="dataTable_wrapper">
+                            <form:form action="${pageContext.request.contextPath}/agent.do/update" commandName="agent" method="post" cssClass="form-horizontal">
+                            	<form:hidden path="id"/>
+                            	<div class="form-group">
+	                                <label class="col-sm-1 control-label">代理商级别</label>
+	                                <div class="col-sm-11">
+	                                	<select name="level" class="selectpicker form-control">
+                                			<option></option>
+	                                		<c:forEach items="${agentLevel }" var="entry">
+	                                			<option value="${entry.name() }" <c:if test="${agent.level==entry }">selected</c:if>>${entry.getName() }</option>
+	                                		</c:forEach>
+	                                	</select>
+	                                </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">代理商名称</label>
+	                                <div class="col-sm-11">
+	                                	<form:input path="agentName" cssClass="form-control"/>
+		                             </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">绑定员工</label>
+	                                <div class="col-sm-11">
+	                                	<form:select path="userIds" items="${userList }" itemValue="userId" itemLabel="username" cssClass="selectpicker form-control" multiple="multiple"/>
+	                                </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">区域</label>
+	                                <div class="col-sm-11">
+	                                	<form:select path="area" items="${areaList }" itemValue="area" itemLabel="area" cssClass="selectpicker form-control"/>
+	                                </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">openid</label>
+	                                <div class="col-sm-11">
+	                                	<form:input path="openid" cssClass="form-control"/>
+	                                </div>
+                                </div>
+                                <label></label>
+                                <button type="submit"
+                                        class="btn btn-primary form-control">修改
+                                </button>
+                            </form:form>
+                        </div>
+                        <!-- /.table-responsive -->
+                    </div>
+                    <!-- /.panel-body -->
+                </div>
+                <!-- /.panel -->
+            </div>
+            <!-- /.col-lg-12 -->
+        </div>
+    </div>
+    <!-- /.container-fluid -->
+</div>
+<jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
diff --git a/src/main/webapp/WEB-INF/view/vm/area/area.jsp b/src/main/webapp/WEB-INF/view/vm/area/area.jsp
new file mode 100644
index 0000000..2e9605b
--- /dev/null
+++ b/src/main/webapp/WEB-INF/view/vm/area/area.jsp
@@ -0,0 +1,82 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://www.springframework.org/tags/form"  prefix="form"%>
+<jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
+<!-- Page Content -->
+<div id="page-wrapper">
+    <div class="container-fluid">
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
+        <div class="panel-heading">
+        </div>
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                       区域信息
+                    </div>
+                    <!-- /.panel-heading -->
+                    <div class="panel-body">
+                        <div class="dataTable_wrapper">
+                        	<form:form cssClass="searchForm form-horizontal" commandName="area" action="${pageContext.request.contextPath}/area.do/area.view/" method="post">
+                        		<button type="button" class="btn btn-default pull-right" id="toggle-advanced-search">查询条件<i class="fa fa-angle-double-down"></i></button>
+                        		<div class="clearfix"></div>
+                        		<div class="row-fluid" id="div-advanced-search" style="display:none;">
+                        		<div class="form-group">
+                        			<label class="col-sm-1 control-label">区域名称</label>
+	                                <div class="col-sm-2">
+	                                	<form:input path="area" cssClass="form-control"/>
+	                                </div>
+                        		</div>
+                                </div>
+                                <div class="form-group">
+                                	<div class="col-sm-2">
+                                		<a href="${pageContext.request.contextPath}/area.do/area_add.view" class="btn btn-primary" role="button">添加厂商</a>
+                                	</div>
+                                	<label class="col-sm-8 control-label"></label>
+                                	<div id="searchBtns" style="display:none;">
+                                	<div class="col-sm-1">
+                                		<button type="button" class="btn btn-primary form-control searchBtn">查询</button>
+                                	</div>
+                                	<div class="col-sm-1">
+                                		<button type="reset" class="btn btn-primary form-control">重置</button>
+                                	</div>
+                                	</div>
+                                </div>
+                            <table class="table table-striped table-bordered table-hover" id="dataTables-example">
+                                <thead>
+                                <tr>
+                                    <th>区域</th>
+                                    <th>操作</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <c:forEach var="area" items="${areaList}">
+                                    <tr>
+                                        <td>${area.area}</td>
+                                        <td>
+                                            <a href="${pageContext.request.contextPath}/area.do/area_update.view?id=${area.id}">修改</a>
+                                            <a href="${pageContext.request.contextPath}/area.do/delete?id=${area.id}"
+                                               onclick="return confirm('是否要删除该区域')">删除</a>
+                                        </td>
+                                    </tr>
+                                </c:forEach>
+                                </tbody>
+                            </table>
+                           <jsp:include page="/WEB-INF/view/admin/pageSplit.jsp"></jsp:include>
+                        </form:form>
+                        </div>
+                        <!-- /.table-responsive -->
+                    </div>
+                    <!-- /.panel-body -->
+                </div>
+                <!-- /.panel -->
+            </div>
+            <!-- /.col-lg-12 -->
+        </div>
+    </div>
+
+    <!-- /.container-fluid -->
+</div>
+
+<jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
+
diff --git a/src/main/webapp/WEB-INF/view/vm/area/area_add.jsp b/src/main/webapp/WEB-INF/view/vm/area/area_add.jsp
new file mode 100644
index 0000000..9bdae1b
--- /dev/null
+++ b/src/main/webapp/WEB-INF/view/vm/area/area_add.jsp
@@ -0,0 +1,47 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
+<jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
+<!-- Page Content -->
+<div id="page-wrapper">
+    <div class="container-fluid">
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
+        <div>
+            <h1 class="page-header">区域管理</h1>
+        </div>
+        <div class="panel-heading">
+        </div>
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                       区域管理
+                    </div>
+                    <!-- /.panel-heading -->
+                    <div class="panel-body">
+                        <div class="dataTable_wrapper">
+                            <form:form action="${pageContext.request.contextPath}/area.do/add" commandName="area" method="post" cssClass="form-horizontal">
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">区域名称</label>
+	                                <div class="col-sm-11">
+	                                	<form:input path="area" cssClass="form-control" required="required"/>
+		                             </div>
+                                </div>
+                                <label></label>
+                                <button type="submit"
+                                        class="btn btn-primary form-control">添加
+                                </button>
+                            </form:form>
+                        </div>
+                        <!-- /.table-responsive -->
+                    </div>
+                    <!-- /.panel-body -->
+                </div>
+                <!-- /.panel -->
+            </div>
+            <!-- /.col-lg-12 -->
+        </div>
+    </div>
+    <!-- /.container-fluid -->
+</div>
+<jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
diff --git a/src/main/webapp/WEB-INF/view/vm/area/area_update.jsp b/src/main/webapp/WEB-INF/view/vm/area/area_update.jsp
new file mode 100644
index 0000000..9277654
--- /dev/null
+++ b/src/main/webapp/WEB-INF/view/vm/area/area_update.jsp
@@ -0,0 +1,48 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
+<jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
+<!-- Page Content -->
+<div id="page-wrapper">
+    <div class="container-fluid">
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
+        <div>
+            <h1 class="page-header">区域管理</h1>
+        </div>
+        <div class="panel-heading">
+        </div>
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                       区域管理
+                    </div>
+                    <!-- /.panel-heading -->
+                    <div class="panel-body">
+                        <div class="dataTable_wrapper">
+                            <form:form action="${pageContext.request.contextPath}/area.do/update" commandName="area" method="post" cssClass="form-horizontal">
+                            	<form:hidden path="id"/>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">区域名称</label>
+	                                <div class="col-sm-11">
+	                                	<form:input path="area" cssClass="form-control" required="required"/>
+		                             </div>
+                                </div>
+                                <label></label>
+                                <button type="submit"
+                                        class="btn btn-primary form-control">修改
+                                </button>
+                            </form:form>
+                        </div>
+                        <!-- /.table-responsive -->
+                    </div>
+                    <!-- /.panel-body -->
+                </div>
+                <!-- /.panel -->
+            </div>
+            <!-- /.col-lg-12 -->
+        </div>
+    </div>
+    <!-- /.container-fluid -->
+</div>
+<jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
diff --git a/src/main/webapp/WEB-INF/view/vm/order/external_order_add.jsp b/src/main/webapp/WEB-INF/view/vm/order/external_order_add.jsp
new file mode 100644
index 0000000..40da619
--- /dev/null
+++ b/src/main/webapp/WEB-INF/view/vm/order/external_order_add.jsp
@@ -0,0 +1,64 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>代理商订单</title>
+    <meta charset="utf-8" />
+    <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+    <!-- CSS 
+        ================================================== -->
+    <!-- Bootstrap 3-->
+    <link href="${pageContext.request.contextPath}/bower_components/bootstrap/dist/css/bootstrap.min.css"
+          rel="stylesheet" media="screen">
+    <link href="${pageContext.request.contextPath}/bower_components/sweetalert/sweetalert.css"
+          rel="stylesheet" type="text/css">
+    <link href="${pageContext.request.contextPath}/bower_components/bootstrap-select-master/dist/css/bootstrap-select.min.css"
+          rel="stylesheet" type="text/css">
+  <body>
+	 <div class="container">
+		  <h2>订单申请</h2>
+		  
+		  <form action="${pageContext.request.contextPath}/order.do/external/add" method="post" class="form-horizontal" role="form">
+		  <input type="hidden" name="openid" value="${openid }"/>
+		  <input type="hidden" name="orderType" value="${orderType }"/>
+		  <div class="form-group">
+		    <label for="carId" class="col-xs-2 control-label">车辆</label>
+		    <div class="col-xs-10">
+		      <select name="carId" class="selectpicker form-controle">
+        		<c:forEach items="${carList }" var="entry">
+        			<option value="${entry.carId }">${entry.carId }</option>
+        		</c:forEach>
+        	  </select>
+		    </div>
+		  </div>
+		  <div class="form-group">
+		    <label for="firstname" class="col-xs-2 control-label">价格</label>
+		    <div class="col-xs-10">
+		      <input type="text" class="form-control" id="price" name="price" value="2000" readonly/>
+		    </div>
+		  </div>
+		  <div class="form-group">
+		    <label for="lastname" class="col-xs-2 control-label pull-left">数量</label>
+		    <div class="col-xs-10">
+		      <input type="number" class="form-control" name="carCnt" required="required"/>
+		    </div>
+		  </div>
+		  <div class="form-group">
+		    <div class="col-xs-offset-2 col-xs-10">
+		      <button type="submit" class="btn btn-default">下订单</button>
+		    </div>
+		  </div>
+		</form>
+	</div>	  
+	 
+	 <!-- JAVASCRIPT
+	     ================================================== -->
+    <script src="${pageContext.request.contextPath}/bower_components/jquery/dist/jquery.min.js"></script>
+	<script src="${pageContext.request.contextPath}/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
+	<script src="${pageContext.request.contextPath}/bower_components/sweetalert/sweetalert.min.js"></script>
+	<!-- select JavaScript -->
+	<script src="${pageContext.request.contextPath}/bower_components/bootstrap-select-master/dist/js/bootstrap-select.min.js"></script>
+	<script src="${pageContext.request.contextPath}/bower_components/bootstrap-select-master/dist/js/i18n/defaults-zh_CN.min.js"></script>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/view/vm/order/external_order_add_success.jsp b/src/main/webapp/WEB-INF/view/vm/order/external_order_add_success.jsp
new file mode 100644
index 0000000..70be05b
--- /dev/null
+++ b/src/main/webapp/WEB-INF/view/vm/order/external_order_add_success.jsp
@@ -0,0 +1,32 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>代理商订单</title>
+    <meta charset="utf-8" />
+    <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+    <!-- CSS 
+        ================================================== -->
+    <!-- Bootstrap 3-->
+    <link href="${pageContext.request.contextPath}/bower_components/bootstrap/dist/css/bootstrap.min.css"
+          rel="stylesheet" media="screen">
+    <link href="${pageContext.request.contextPath}/bower_components/sweetalert/sweetalert.css"
+          rel="stylesheet" type="text/css">
+    <link href="${pageContext.request.contextPath}/bower_components/bootstrap-select-master/dist/css/bootstrap-select.min.css"
+          rel="stylesheet" type="text/css">
+  <body>
+	 <div class="container">
+		  <h2>订单申请成功</h2>
+	</div>	  
+	 
+	 <!-- JAVASCRIPT
+	     ================================================== -->
+    <script src="${pageContext.request.contextPath}/bower_components/jquery/dist/jquery.min.js"></script>
+	<script src="${pageContext.request.contextPath}/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
+	<script src="${pageContext.request.contextPath}/bower_components/sweetalert/sweetalert.min.js"></script>
+	<!-- select JavaScript -->
+	<script src="${pageContext.request.contextPath}/bower_components/bootstrap-select-master/dist/js/bootstrap-select.min.js"></script>
+	<script src="${pageContext.request.contextPath}/bower_components/bootstrap-select-master/dist/js/i18n/defaults-zh_CN.min.js"></script>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/view/vm/order/order.jsp b/src/main/webapp/WEB-INF/view/vm/order/order.jsp
new file mode 100644
index 0000000..1b19b6a
--- /dev/null
+++ b/src/main/webapp/WEB-INF/view/vm/order/order.jsp
@@ -0,0 +1,102 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://www.springframework.org/tags/form"  prefix="form"%>
+<jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
+<!-- Page Content -->
+<div id="page-wrapper">
+    <div class="container-fluid">
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
+        <div class="panel-heading">
+        </div>
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        代理商信息
+                    </div>
+                    <!-- /.panel-heading -->
+                    <div class="panel-body">
+                        <div class="dataTable_wrapper">
+                        	<form:form cssClass="searchForm form-horizontal" commandName="agent" action="${pageContext.request.contextPath}/agent.do/agent.view/" method="post">
+                        		<button type="button" class="btn btn-default pull-right" id="toggle-advanced-search">查询条件<i class="fa fa-angle-double-down"></i></button>
+                        		<div class="clearfix"></div>
+                        		<div class="row-fluid" id="div-advanced-search" style="display:none;">
+                        		<div class="form-group">
+                        			<label class="col-sm-1 control-label">级别</label>
+	                                <div class="col-sm-2">
+	                                	<select name="level" class="form-control">
+                                			<option></option>
+	                                		<c:forEach items="${agentLevel }" var="entry">
+	                                			<option value="${entry.name() }" <c:if test="${agent.level==entry }">selected</c:if>>${entry.getName() }</option>
+	                                		</c:forEach>
+	                                	</select>
+	                                </div>
+                        			<label class="col-sm-1 control-label">名称</label>
+	                                <div class="col-sm-2">
+	                                	<form:input path="agentName" cssClass="form-control"/>
+	                                </div>
+                        			<label class="col-sm-1 control-label">区域</label>
+	                                <div class="col-sm-2">
+	                                	<form:input path="area" cssClass="form-control"/>
+	                                </div>
+                        		</div>
+                                </div>
+                                <div class="form-group">
+                                	<div class="col-sm-2">
+                                		<a href="${pageContext.request.contextPath}/agent.do/agent_add.view" class="btn btn-primary" role="button">新增</a>
+                                		<button type="button" class="btn btn-primary" onclick="uploader.uploadModal('${pageContext.request.contextPath}/agent.do/import','${pageContext.request.contextPath}/template/agent_tpl.xlsx')">批量上传</button>
+                                	</div>
+                                	<label class="col-sm-8 control-label"></label>
+                                	<div id="searchBtns" style="display:none;">
+                                	<div class="col-sm-1">
+                                		<button type="button" class="btn btn-primary form-control searchBtn">查询</button>
+                                	</div>
+                                	<div class="col-sm-1">
+                                		<button type="reset" class="btn btn-primary form-control">重置</button>
+                                	</div>
+                                	</div>
+                                </div>
+                            <table class="table table-striped table-bordered table-hover" id="dataTables-example">
+                                <thead>
+                                <tr>
+                                    <th>级别</th>
+                                    <th>名称</th>
+                                    <th>绑定职员</th>
+                                    <th>区域</th>
+                                    <th>操作</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <c:forEach var="agent" items="${agentList}">
+                                    <tr>
+                                        <td>${agent.level.getName()}</td>
+                                        <td>${agent.agentName}</td>
+                                        <td>${agent.usernames}</td>
+                                        <td>${agent.area}</td>
+                                        <td>
+                                            <a href="${pageContext.request.contextPath}/agent.do/agent_update.view?id=${agent.id}">修改</a>
+                                            <a href="${pageContext.request.contextPath}/agent.do/delete?id=${agent.id}"
+                                               onclick="return confirm('是否要删除该代理商')">删除</a>
+                                        </td>
+                                    </tr>
+                                </c:forEach>
+                                </tbody>
+                            </table>
+                           <jsp:include page="/WEB-INF/view/admin/pageSplit.jsp"></jsp:include>
+                        </form:form>
+                        </div>
+                        <!-- /.table-responsive -->
+                    </div>
+                    <!-- /.panel-body -->
+                </div>
+                <!-- /.panel -->
+            </div>
+            <!-- /.col-lg-12 -->
+        </div>
+    </div>
+
+    <!-- /.container-fluid -->
+</div>
+
+<jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
+
diff --git a/src/main/webapp/WEB-INF/view/vm/order/order_update.jsp b/src/main/webapp/WEB-INF/view/vm/order/order_update.jsp
new file mode 100644
index 0000000..f1715fe
--- /dev/null
+++ b/src/main/webapp/WEB-INF/view/vm/order/order_update.jsp
@@ -0,0 +1,71 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
+<jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
+<!-- Page Content -->
+<div id="page-wrapper">
+    <div class="container-fluid">
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
+        <div>
+            <h1 class="page-header">代理商管理</h1>
+        </div>
+        <div class="panel-heading">
+        </div>
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        代理商管理
+                    </div>
+                    <!-- /.panel-heading -->
+                    <div class="panel-body">
+                        <div class="dataTable_wrapper">
+                            <form:form action="${pageContext.request.contextPath}/agent.do/update" commandName="agent" method="post" cssClass="form-horizontal">
+                            	<form:hidden path="id"/>
+                            	<div class="form-group">
+	                                <label class="col-sm-1 control-label">代理商级别</label>
+	                                <div class="col-sm-11">
+	                                	<select name="level" class="selectpicker form-control">
+                                			<option></option>
+	                                		<c:forEach items="${agentLevel }" var="entry">
+	                                			<option value="${entry.name() }" <c:if test="${agent.level==entry }">selected</c:if>>${entry.getName() }</option>
+	                                		</c:forEach>
+	                                	</select>
+	                                </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">代理商名称</label>
+	                                <div class="col-sm-11">
+	                                	<form:input path="agentName" cssClass="form-control"/>
+		                             </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">绑定员工</label>
+	                                <div class="col-sm-11">
+	                                	<form:select path="userIds" items="${userList }" itemValue="userId" itemLabel="username" cssClass="selectpicker form-control" multiple="multiple"/>
+	                                </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">区域</label>
+	                                <div class="col-sm-11">
+	                                	<form:input path="area" cssClass="form-control"/>
+	                                </div>
+                                </div>
+                                <label></label>
+                                <button type="submit"
+                                        class="btn btn-primary form-control">修改
+                                </button>
+                            </form:form>
+                        </div>
+                        <!-- /.table-responsive -->
+                    </div>
+                    <!-- /.panel-body -->
+                </div>
+                <!-- /.panel -->
+            </div>
+            <!-- /.col-lg-12 -->
+        </div>
+    </div>
+    <!-- /.container-fluid -->
+</div>
+<jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
diff --git a/src/main/webapp/WEB-INF/view/vm/vendor/vendor.jsp b/src/main/webapp/WEB-INF/view/vm/vendor/vendor.jsp
new file mode 100644
index 0000000..8233de5
--- /dev/null
+++ b/src/main/webapp/WEB-INF/view/vm/vendor/vendor.jsp
@@ -0,0 +1,102 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://www.springframework.org/tags/form"  prefix="form"%>
+<jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
+<!-- Page Content -->
+<div id="page-wrapper">
+    <div class="container-fluid">
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
+        <div class="panel-heading">
+        </div>
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        厂商信息
+                    </div>
+                    <!-- /.panel-heading -->
+                    <div class="panel-body">
+                        <div class="dataTable_wrapper">
+                        	<form:form cssClass="searchForm form-horizontal" commandName="vendor" action="${pageContext.request.contextPath}/vendor.do/vendor.view/" method="post">
+                        		<button type="button" class="btn btn-default pull-right" id="toggle-advanced-search">查询条件<i class="fa fa-angle-double-down"></i></button>
+                        		<div class="clearfix"></div>
+                        		<div class="row-fluid" id="div-advanced-search" style="display:none;">
+                        		<div class="form-group">
+                        			<label class="col-sm-1 control-label">厂商名称</label>
+	                                <div class="col-sm-2">
+	                                	<form:input path="vendorName" cssClass="form-control"/>
+	                                </div>
+                        		</div>
+                                </div>
+                                <div class="form-group">
+                                	<div class="col-sm-2">
+                                		<a href="${pageContext.request.contextPath}/vendor.do/vendor_add.view" class="btn btn-primary" role="button">添加厂商</a>
+                                	</div>
+                                	<label class="col-sm-8 control-label"></label>
+                                	<div id="searchBtns" style="display:none;">
+                                	<div class="col-sm-1">
+                                		<button type="button" class="btn btn-primary form-control searchBtn">查询</button>
+                                	</div>
+                                	<div class="col-sm-1">
+                                		<button type="reset" class="btn btn-primary form-control">重置</button>
+                                	</div>
+                                	</div>
+                                </div>
+                            <table class="table table-striped table-bordered table-hover" id="dataTables-example">
+                                <thead>
+                                <tr>
+                                    <th>厂商</th>
+                                    <th>负责人</th>
+                                    <th>网站</th>
+                                    <th>地址</th>
+                                    <th>电话</th>
+                                    <th>手机</th>
+                                    <th>邮箱</th>
+                                    <th>操作</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <c:forEach var="vendor" items="${vendorList}">
+                                    <tr>
+                                        <td>${vendor.vendorName}</td>
+                                        <td>${vendor.contact}</td>
+                                        <td><a href="${vendor.url}" 
+                                        	   data-toggle="popover" 
+                                        	   data-trigger="hover" 
+                                        	   data-title="网址" 
+                                        	   data-placement="top" 
+                                        	   data-container="body"
+                                        	   data-content="${vendor.url}" 
+                                        	   target="_blank">点击跳转</a>
+                                       	</td>
+                                        <td>${vendor.address}</td>
+                                        <td>${vendor.telephone}</td>
+                                        <td>${vendor.phone}</td>
+                                        <td>${vendor.email}</td>
+                                        <td>
+                                            <a href="${pageContext.request.contextPath}/vendor.do/vendor_update.view?id=${vendor.id}">修改</a>
+                                            <a href="${pageContext.request.contextPath}/vendor.do/delete?id=${vendor.id}"
+                                               onclick="return confirm('是否要删除该厂商')">删除</a>
+                                        </td>
+                                    </tr>
+                                </c:forEach>
+                                </tbody>
+                            </table>
+                           <jsp:include page="/WEB-INF/view/admin/pageSplit.jsp"></jsp:include>
+                        </form:form>
+                        </div>
+                        <!-- /.table-responsive -->
+                    </div>
+                    <!-- /.panel-body -->
+                </div>
+                <!-- /.panel -->
+            </div>
+            <!-- /.col-lg-12 -->
+        </div>
+    </div>
+
+    <!-- /.container-fluid -->
+</div>
+
+<jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
+
diff --git a/src/main/webapp/WEB-INF/view/vm/vendor/vendor_add.jsp b/src/main/webapp/WEB-INF/view/vm/vendor/vendor_add.jsp
new file mode 100644
index 0000000..0b5a780
--- /dev/null
+++ b/src/main/webapp/WEB-INF/view/vm/vendor/vendor_add.jsp
@@ -0,0 +1,83 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
+<jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
+<!-- Page Content -->
+<div id="page-wrapper">
+    <div class="container-fluid">
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
+        <div>
+            <h1 class="page-header">厂商管理</h1>
+        </div>
+        <div class="panel-heading">
+        </div>
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                       厂商管理
+                    </div>
+                    <!-- /.panel-heading -->
+                    <div class="panel-body">
+                        <div class="dataTable_wrapper">
+                            <form:form action="${pageContext.request.contextPath}/vendor.do/add" commandName="vendor" method="post" cssClass="form-horizontal">
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">厂商名称</label>
+	                                <div class="col-sm-11">
+	                                	<form:input path="vendorName" cssClass="form-control" required="required"/>
+		                             </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">负责人</label>
+	                                <div class="col-sm-11">
+	                                	<form:input path="contact" cssClass="form-control"/>
+	                                </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">网站</label>
+	                                <div class="col-sm-11">
+	                                	<form:input path="url" cssClass="form-control" type="url"/>
+	                                </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">地址</label>
+	                                <div class="col-sm-11">
+	                                	<form:input path="address" cssClass="form-control"/>
+	                                </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">电话</label>
+	                                <div class="col-sm-11">
+	                                	<form:input path="telephone" cssClass="form-control" type="number"/>
+	                                </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">手机</label>
+	                                <div class="col-sm-11">
+	                                	<form:input path="phone" cssClass="form-control" type="number"/>
+	                                </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">邮箱</label>
+	                                <div class="col-sm-11">
+	                                	<form:input path="email" cssClass="form-control" type="email"/>
+	                                </div>
+                                </div>
+                                <label></label>
+                                <button type="submit"
+                                        class="btn btn-primary form-control">添加
+                                </button>
+                            </form:form>
+                        </div>
+                        <!-- /.table-responsive -->
+                    </div>
+                    <!-- /.panel-body -->
+                </div>
+                <!-- /.panel -->
+            </div>
+            <!-- /.col-lg-12 -->
+        </div>
+    </div>
+    <!-- /.container-fluid -->
+</div>
+<jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
diff --git a/src/main/webapp/WEB-INF/view/vm/vendor/vendor_update.jsp b/src/main/webapp/WEB-INF/view/vm/vendor/vendor_update.jsp
new file mode 100644
index 0000000..c35e0f7
--- /dev/null
+++ b/src/main/webapp/WEB-INF/view/vm/vendor/vendor_update.jsp
@@ -0,0 +1,84 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
+<jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
+<!-- Page Content -->
+<div id="page-wrapper">
+    <div class="container-fluid">
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
+        <div>
+            <h1 class="page-header">厂商管理</h1>
+        </div>
+        <div class="panel-heading">
+        </div>
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                       厂商管理
+                    </div>
+                    <!-- /.panel-heading -->
+                    <div class="panel-body">
+                        <div class="dataTable_wrapper">
+                            <form:form action="${pageContext.request.contextPath}/vendor.do/update" commandName="vendor" method="post" cssClass="form-horizontal">
+                            	<form:hidden path="id"/>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">厂商名称</label>
+	                                <div class="col-sm-11">
+	                                	<form:input path="vendorName" cssClass="form-control" required="required"/>
+		                             </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">负责人</label>
+	                                <div class="col-sm-11">
+	                                	<form:input path="contact" cssClass="form-control"/>
+	                                </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">网站</label>
+	                                <div class="col-sm-11">
+	                                	<form:input path="url" cssClass="form-control" type="url"/>
+	                                </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">地址</label>
+	                                <div class="col-sm-11">
+	                                	<form:input path="address" cssClass="form-control"/>
+	                                </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">电话</label>
+	                                <div class="col-sm-11">
+	                                	<form:input path="telephone" cssClass="form-control" type="number"/>
+	                                </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">手机</label>
+	                                <div class="col-sm-11">
+	                                	<form:input path="phone" cssClass="form-control" type="number"/>
+	                                </div>
+                                </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label">邮箱</label>
+	                                <div class="col-sm-11">
+	                                	<form:input path="email" cssClass="form-control" type="email"/>
+	                                </div>
+                                </div>
+                                <label></label>
+                                <button type="submit"
+                                        class="btn btn-primary form-control">修改
+                                </button>
+                            </form:form>
+                        </div>
+                        <!-- /.table-responsive -->
+                    </div>
+                    <!-- /.panel-body -->
+                </div>
+                <!-- /.panel -->
+            </div>
+            <!-- /.col-lg-12 -->
+        </div>
+    </div>
+    <!-- /.container-fluid -->
+</div>
+<jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index ea48730..0bdc465 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -11,7 +11,7 @@
     <!--用于设置context的参数,如果不设置contextConfigLocation则默认的spring配置文件applicationContext.xml放在WEB-INF目录下-->
     <context-param>
         <param-name>contextConfigLocation</param-name>
-        <param-value>classpath:spring.xml</param-value>
+        <param-value>classpath:spring/spring.xml</param-value>
     </context-param>
     <listener>  
         <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>  
@@ -41,6 +41,18 @@
         <servlet-name>default</servlet-name>
         <url-pattern>*.woff</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>default</servlet-name>
+        <url-pattern>*.ttf</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>default</servlet-name>
+        <url-pattern>*.svg</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>default</servlet-name>
+        <url-pattern>*.eot</url-pattern>
+    </servlet-mapping>
     <servlet-mapping>
         <servlet-name>default</servlet-name>
         <url-pattern>*.woff2</url-pattern>
@@ -73,10 +85,6 @@
         <servlet-name>default</servlet-name>
         <url-pattern>*.gif</url-pattern>
     </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>default</servlet-name>
-        <url-pattern>*.ttf</url-pattern>
-    </servlet-mapping>
 	
 	<!-- tld配置 -->
 	<jsp-config>
@@ -127,7 +135,7 @@
         <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
         <init-param>
             <param-name>contextConfigLocation</param-name>
-            <param-value>classpath:spring-mvc.xml</param-value>
+            <param-value>classpath:spring/spring-mvc.xml</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
diff --git a/src/main/webapp/js/main.js b/src/main/webapp/js/main.js
index 0eaa588..3dc96a0 100644
--- a/src/main/webapp/js/main.js
+++ b/src/main/webapp/js/main.js
@@ -1,4 +1,6 @@
 $(document).ready(function () {
+	$("[data-toggle='tooltip']").tooltip();
+	$("[data-toggle='popover']").popover();
 	$('html').niceScroll({cursorcolor:"#ccc", horizrailenabled: false, enablekeyboard: false});
     dataTable = $('#dataTables-example').DataTable({
 	  //dom: '<"toolbar">',
diff --git a/src/main/webapp/template/agent_tpl.xlsx b/src/main/webapp/template/agent_tpl.xlsx
index 8b8511209003f098336f67782492ed4dd559ea86..2af6756edd91bc65281a9e7c532093a94a208eb3 100644
GIT binary patch
delta 1432
zcmV;J1!wyFN}@}!;tC1HKQ=rr0RRBylj{l_f5g)<O9L?!2k>3+JA~{uX9p3<r9(mJ
z)<NBmOWKQGUd~HS>?R1MgN0kf>e9iXL!k(66~B$=ao@t!ii2wg$0WR8{_l~{&b3O>
zmB@|M5aRt-fRTV$a|y!`pPn4=9b#l`1UyPLh!Bs2!5y}{LyfV>)q)9eVr_Orh=~)S
ze<IV;nE-b((7B4NTjoPzvRp*mBtlq~l6DXr5EV(lDAom7cW)b`0_0^Oy1yHY8p)_-
zA8*ffIj-)<^?FfFmXugVv&4n5GVbSSpuzUIBQUa~%q0Zf)$r31CXA8|^M|U+X}x&y
zp{l!eHJ|$kXT82p`RC)Rxq0#uCS`N`D&8z-Zm`=S`)gh!ojx?P*KJ?^d8%*CC(q^`
zOYS9z3x1xfe>8~urtAxoAq^C>GYm2d32%}k_;dmQ0Fsk#7cGC3oTmjzK^h}y4h4#)
zk26iJEF$8gByGq2`Yt8eQJfa=#U?e&+1cG8i`y5~kqtO6jV@`Hq?CXbrj~kD(jVU+
z&Tc62f$N%gMng$=;OTAk@k6mS?%B5hfgpqSC2d2nIb&Y5ptw(r1&v5!oZ<nuZpFNH
z!0Y~y>ewtzub6-0QqzGUcc*ZerjY^`MywU+FpxOtctHKWmDcaslsJV>areBoXTm6p
z6ieC3u<J=FQ6hg_Y2)~^!@6Ix3oiED{pKCLlEN8pnvftJ8-%{EdCukxnX00eSV3$%
zanO|XF3T6^lvPFFpPv%8ezGQkFQ1?T5unB~Q4-s~H0FOf20r4a6d8RV5E;1$as&6!
zbtOes;(zx!h6L=8p(<Y2`)m*Wz`i<CL&Miy_-3}BL9W_>Y0r~OY(eZqUhfv*1&#ny
zC)s5bE=-3c_)C<GUcwggmqDzoLyM~{xkdu9_Q9xM<G1nTaAr21!T;@u&yv|c&#)m~
zU(13AUKM}NYzcY@^LoppBeVSCe{xZ0jJ?BPtiWUQHdR`%4R%C~*rzF$y~XaQ*z7H~
zm}2t-#!%itBi47iMhre^JU`Mn#V(IDPO+;ajZ-XpE&Pqh=$n%piNObv7e^we*!7Xf
zDRy%ta*AcI6BtAe&K)LiTYQ^>6zJN<=n(Hi9KvMI;>FeG-stgxi(a#Q1z)&ZN$p7o
zP4C}pO59-aG{JQ+Ho7``b!h^6b-!!z`2w^}nxM4Cn6TfByiX9;mRN4VJ;^_qd`^jR
z5^qWWK9$rO7aW%X^W_p%y2m<;qS)azt^NX&Aq^C>{29;!1qDPglR&f493}yOQA@)x
z6ouaf|3k@pn`D*gLfe7Lo*W2PCccH_ZYwrvNTS{Ty=lAE4u+7I+;i@CPcF%p2USNu
zU|rSd9MOcJ2()NqrFS`cFIVvcik#<K^19KGqa!%9EN*WyVVGzvyxPWq^%b}%khEjM
z<Y@1`VHi8H2gO|y96E^G#wzZA!`1Gv;o^($0M7`SV+Ec|?m6y&u^EZzgp^`Lnr~b8
z04Xrkpg?<vX+rUz*Mn8=YD2F~oT~Ci6W(-+J7r5Th@<=9s?pfCZPKQFjF6w=kM+x2
z|J1nB-L3?nB9np%3*0xh$nf+M7FToU*I~!o3gqK4=vQh|^l=9W$S4FlU_;!qvPqww
z%M~iR9mZr4(|Jh<>(6I5@}j>BG!)cn@V`WQACokmk&+UYQg*kP5YK=i_vI%jegTsq
z4HUCKAI}2`#XmMYE&%`l<&zg9Qvx&$lR*q6laV7T0XCDoBR~QCll>zg8*h>$_;dmQ
z0Fng&02lxO00000000000001HlQ<+r0uUOLe<UIs1w=8EKmh;%Q33z}5dZ)H00000
m00000007{Vyd*vXS09s2A1RY1B`N{llTall1|=c@0000AN1?R<

delta 1395
zcmV-(1&sQlOZ-Z(;tB~QBd`7+0RR9Qlj{l_f25KzOT$1E$9KW+aNKS$I*7{UIuwL%
z9n}3uu1z3$7jrLSH$f;JEMyU@O9zJz1rgjTejCq_Z{cZmarDMNkN4yE{yg5j%rkPK
zN|R~`>24>WL_wtE6h<LEJvrVvpv0hrSY{ejNXN?1uGrq<#vpOKU_zQ87DtSkC{ejI
ze;r*YaFd}fbBQjNBW8+H$=D=HVV<$QAlPTQOo5U}SAZcsq@;rMyi&d2EVxMpNAdpp
z*whnyJ89NSJ6&;xf)|NX!896_WT*lAu@k2R$A$9)-P7=M4`qV0FU%j5t!K^h*#~8B
z)^@S*A)NIGKI<R%Pwmx%7hzhr*Kh4=8}5qTl<ZIQs&sbO&R;fn`TN*!+W&l*du{Ov
zlTjZOlXfEzvr-Hq3kfi)ihW@M002CbeHSf%4?9o6a*#R*nnQu2?&C~TD~pK8Wl7qO
z`}JK)vY|RD;EP0Rmb0_FBhKz$b<4Kkyh2m*Jjpl%Be7CuUGg8_pDu1W^Ff$Ov}mB@
zd+_{z{_(?XhwjBU0D%#M@g;9Uutl1B*?<;4K?{bE8l4t_wr-tz>p)c9A>F2vEW1vB
zwNQrl423&~1M6Bzctp9;U_wvgpcR4i`$k!RVAJv(IxXDG#$HI&mMB)LRbk(ea;9bR
zyf)~>s-?PL^GhKQ+}-94y;jnp$2ufLm-a&6)_j-VrNlI!Rf;NzZD$VZl0W3dV#?F`
ztn1HD1v@`lvmjPWXh8<3XiS{N_OB3sUt-`heaeW@cL9-6$e^~cfVM69(=|=-cb9{f
zlpsB37_Sf6p1Og3b*zF~Y})V*cb`G6n?Px&$rZIAcA}{EkKiSZfKn&<Rpgb}5(zz-
zR?$n;Lh;&*RaIzcl_xhuAU8gs{xy6XPWERe!x?(-27HoC-aV7{>AG4TMG*6UnZq3;
z4^dukMRa6dO#dgBbjH{R3Z@D?HE%o5X6cqXA_wf#7|Z{~7GrF3#8Q%Q)Il|zuY-b*
zI;JN&#@N+~jxl!qz7Fca`8p{0sN?cP#~8ag(J{tuPjvKt>t|#ex<!JL<gXe{h|Z0z
z+*|s^3@*?NS5b6@6>In++*%n?&swNEr`>SodNXDTtpnQVzv!wJ26EM5*U&`+G~g^D
zWi?_rYzE#XgpFlZSa3`AhmzlMhE9>6yPKrs7F}>c1<F?_Qt6(ny!&~M_ul+30FzN4
z6tf;0&;kYji@dBnv-2D#0e@dh!!Q)Z-vz%z$$Oi0gXv1!fy$m72u>8=LUPvyn?EGc
zZr|QC-D(Fz$V=`y_jgY&DOU&CCO=@E(5gatMo<EZX)aV#p||Ziy+?`jRB_sB1r<7i
zL#z7srevmI+QN&~2CNt0l0Z_fV5UNQ?@fWRV|$R)Wx=6>xYJfrAAhd4!G^Lg+5nyr
zvcM8N<<wK$15+~+(Fw`fh&11}jR4Ltv>-uwhx07Qe_jt(x~mOQnK-5JM-$$3iaTX<
zHi)D9;KXR`x-RSHF-FLr<B!erYkX=dRKF_*s4h7xm<8&!txG(;gvGVg`AyjIP5^&6
z2K`Envlw@P08c`IVm63-R^I22Pun%B`yHlandXZvAw@i&{m6^{KG0B*r@{Xc^ShMH
zBXQXiXNw8(3>b1>euDZJvr!-80|_J}ul^qa000@2JtI>AC6kdOPyr{C;v+x|?Gpe1
zcx*3oba`xLlVKwj8!)PhePIFs06YZ%02lxO000000000000012lU^i60`3`;r6eL7
z|BJk=JOKazQ33z}5dZ)H0000000000006#|;v_x+F_R%BQ~|h?b|oeT{~-VX002rv
BiQNDI

diff --git a/target/classes/db.properties b/target/classes/db.properties
index 4625c71..38d320a 100644
--- a/target/classes/db.properties
+++ b/target/classes/db.properties
@@ -1,4 +1,8 @@
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://rm-uf6ggkftngujcn480o.mysql.rds.aliyuncs.com:3306/car_sale_sh
-jdbc.password=root_123
-jdbc.username=root
+#jdbc.url=jdbc:mysql://rm-uf6ggkftngujcn480o.mysql.rds.aliyuncs.com:3306/car_sale_sh
+#jdbc.password=root_123
+#jdbc.username=root
+
+jdbc.url=jdbc:mysql://localhost:3306/vehicle?characterEncoding=utf8&useSSL=false
+jdbc.password=root
+jdbc.username=root
\ No newline at end of file
diff --git a/target/classes/log4j.properties b/target/classes/log4j.properties
index ff1028a..9a5d202 100644
--- a/target/classes/log4j.properties
+++ b/target/classes/log4j.properties
@@ -1,4 +1,4 @@
-log4j.rootLogger = debug , stdout
+log4j.rootLogger = debug , stdout ,consoleAppender
 
 ###  output to the console ###
 log4j.appender.stdout = org.apache.log4j.ConsoleAppender
@@ -6,6 +6,7 @@ log4j.appender.stdout.Target = System.out
 log4j.appender.stdout.layout = org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss} [%c]-[%p] %m%n
 
+log4j.appender.consoleAppender.layout.ConversionPattern=ProcessDefinitionId=%X{mdcProcessDefinitionID} executionId=%X{mdcExecutionId} mdcProcessInstanceID=%X{mdcProcessInstanceID} mdcBusinessKey=%X{mdcBusinessKey} %m%n
 
 #mybatis
 log4j.logger.org.apache.ibatis=info

From d3b86cdc60a568297850de5ea1a0f6dc54972ebb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=8D=8E=E6=88=90?= <duhuacheng.ver@gmail.com>
Date: Mon, 27 Mar 2017 16:45:32 +0800
Subject: [PATCH 13/14] =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=B8=8A=E4=BC=A0,?=
 =?UTF-8?q?=E5=8D=95=E4=BE=8B=E4=B8=8A=E4=BC=A0,=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/{upload => entity}/FileInfo.java | 151 ++---
 src/main/java/com/upload/Message.java         |  46 --
 .../java/com/upload/UploadController.java     |  56 --
 .../java/com/{upload => util}/Constant.java   |  38 +-
 .../java/com/{upload => util}/FtpClient.java  | 174 +++---
 src/main/java/com/util/ResultMapUtil.java     |   6 +-
 .../vm/controller/ProcurementController.java  | 206 +++---
 .../com/vm/controller/UploadController.java   |  95 +++
 src/main/java/com/vm/dao/FileUploadDao.java   |  13 +
 .../java/com/vm/service/FileUploadBiz.java    |  57 ++
 .../service/impl/FileUploadBizImpl.java}      | 589 ++++++++----------
 src/main/resources/mapper/FileUploadDao.xml   |  44 ++
 src/main/resources/spring/spring-mvc.xml      |   2 +-
 src/main/resources/upload.properties          |  18 +-
 .../webapp/WEB-INF/view/admin/batchUpload.jsp |  59 +-
 src/main/webapp/WEB-INF/view/admin/nav.jsp    |   9 +-
 .../webapp/WEB-INF/view/vm/agent/agent.jsp    |   4 +-
 src/main/webapp/WEB-INF/view/vm/car/car.jsp   |   4 +-
 .../view/vm/procurement/procurement.jsp       | 222 +++----
 .../WEB-INF/view/vm/vendor/vendor_add.jsp     |  15 +
 .../WEB-INF/view/vm/vendor/vendor_update.jsp  |  15 +
 src/main/webapp/css/Splitbutton.css           |  10 -
 src/main/webapp/css/style.css                 |  32 +
 src/main/webapp/js/ajaxfileupload.js          |   6 +-
 src/main/webapp/js/main.js                    | 246 +++++++-
 25 files changed, 1218 insertions(+), 899 deletions(-)
 rename src/main/java/com/{upload => entity}/FileInfo.java (66%)
 delete mode 100644 src/main/java/com/upload/Message.java
 delete mode 100644 src/main/java/com/upload/UploadController.java
 rename src/main/java/com/{upload => util}/Constant.java (91%)
 rename src/main/java/com/{upload => util}/FtpClient.java (94%)
 create mode 100644 src/main/java/com/vm/controller/UploadController.java
 create mode 100644 src/main/java/com/vm/dao/FileUploadDao.java
 create mode 100644 src/main/java/com/vm/service/FileUploadBiz.java
 rename src/main/java/com/{upload/FileUpload.java => vm/service/impl/FileUploadBizImpl.java} (52%)
 create mode 100644 src/main/resources/mapper/FileUploadDao.xml
 delete mode 100644 src/main/webapp/css/Splitbutton.css
 create mode 100644 src/main/webapp/css/style.css

diff --git a/src/main/java/com/upload/FileInfo.java b/src/main/java/com/entity/FileInfo.java
similarity index 66%
rename from src/main/java/com/upload/FileInfo.java
rename to src/main/java/com/entity/FileInfo.java
index 4515967..ccc03fe 100644
--- a/src/main/java/com/upload/FileInfo.java
+++ b/src/main/java/com/entity/FileInfo.java
@@ -1,73 +1,78 @@
-package com.upload;
-
-import java.io.Serializable;
-
-public class FileInfo implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	private String fileName;
-	private String filePath;
-	private String uploadTime;
-	private String fileType;
-	private String originalFilename;
-	private String uuid;
-	private String errorMsg;
-
-	public String getFileName() {
-		return fileName;
-	}
-
-	public void setFileName(String fileName) {
-		this.fileName = fileName;
-	}
-
-	public String getFilePath() {
-		return filePath;
-	}
-
-	public void setFilePath(String filePath) {
-		this.filePath = filePath;
-	}
-
-	public String getUploadTime() {
-		return uploadTime;
-	}
-
-	public void setUploadTime(String uploadTime) {
-		this.uploadTime = uploadTime;
-	}
-
-	public String getFileType() {
-		return fileType;
-	}
-
-	public void setFileType(String fileType) {
-		this.fileType = fileType;
-	}
-
-	public String getOriginalFilename() {
-		return originalFilename;
-	}
-
-	public void setOriginalFilename(String originalFilename) {
-		this.originalFilename = originalFilename;
-	}
-
-	public String getUuid() {
-		return uuid;
-	}
-
-	public void setUuid(String uuid) {
-		this.uuid = uuid;
-	}
-
-	public String getErrorMsg() {
-		return errorMsg;
-	}
-
-	public void setErrorMsg(String errorMsg) {
-		this.errorMsg = errorMsg;
-	}
-
-}
+package com.entity;
+
+import java.io.Serializable;
+
+public class FileInfo implements Serializable {
+	private static final long serialVersionUID = 3517465238526255583L;
+	private Long id;
+	private String fileName;
+	private String filePath;
+	private String fileType;
+	private String originalFilename;
+	private String uuid;
+	private String uploadTime;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getFileName() {
+		return fileName;
+	}
+
+	public void setFileName(String fileName) {
+		this.fileName = fileName;
+	}
+
+	public String getFilePath() {
+		return filePath;
+	}
+
+	public void setFilePath(String filePath) {
+		this.filePath = filePath;
+	}
+
+	public String getUploadTime() {
+		return uploadTime;
+	}
+
+	public void setUploadTime(String uploadTime) {
+		this.uploadTime = uploadTime;
+	}
+
+	public String getFileType() {
+		return fileType;
+	}
+
+	public void setFileType(String fileType) {
+		this.fileType = fileType;
+	}
+
+	public String getOriginalFilename() {
+		return originalFilename;
+	}
+
+	public void setOriginalFilename(String originalFilename) {
+		this.originalFilename = originalFilename;
+	}
+
+	public String getUuid() {
+		return uuid;
+	}
+
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+
+	@Override
+	public String toString() {
+		return "FileInfo [id=" + id + ", fileName=" + fileName + ", filePath="
+				+ filePath + ", uploadTime=" + uploadTime + ", fileType="
+				+ fileType + ", originalFilename=" + originalFilename
+				+ ", uuid=" + uuid + "]";
+	}
+}
diff --git a/src/main/java/com/upload/Message.java b/src/main/java/com/upload/Message.java
deleted file mode 100644
index e86d157..0000000
--- a/src/main/java/com/upload/Message.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.upload;
-
-import java.io.Serializable;
-
-public class Message implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	private String resultCode;
-	private String resultMsg;
-	private Object data;
-	private String uploadType;
-
-	public String getUploadType() {
-		return uploadType;
-	}
-
-	public void setUploadType(String uploadType) {
-		this.uploadType = uploadType;
-	}
-
-	public String getResultCode() {
-		return resultCode;
-	}
-
-	public void setResultCode(String resultCode) {
-		this.resultCode = resultCode;
-	}
-
-	public String getResultMsg() {
-		return resultMsg;
-	}
-
-	public void setResultMsg(String resultMsg) {
-		this.resultMsg = resultMsg;
-	}
-
-	public Object getData() {
-		return data;
-	}
-
-	public void setData(Object data) {
-		this.data = data;
-	}
-
-}
diff --git a/src/main/java/com/upload/UploadController.java b/src/main/java/com/upload/UploadController.java
deleted file mode 100644
index 6fe03bb..0000000
--- a/src/main/java/com/upload/UploadController.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.upload;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-
-@Controller
-@RequestMapping("upload.do")
-public class UploadController {
-
-	@Autowired
-	private FileUpload fileUpload;
-	
-	
-	/**
-	 * 上传文件
-	 * 
-	 * @param request
-	 * @return
-	 */
-	@RequestMapping("file")
-	@ResponseBody
-	public Message uploadFile(HttpServletRequest request,String type) {
-		return fileUpload.fileUploadFile(request,type);
-	}
-
-	/**
-	 * 上传图片
-	 * 
-	 * @param request
-	 * @return
-	 */
-	@RequestMapping("image")
-	@ResponseBody
-	public Message uploadImage(HttpServletRequest request,String type) {
-		return fileUpload.fileUploadImage(request,type);
-	}
-	
-	/**
-	 * 多文件上传
-	 * 
-	 * @param request
-	 * @return
-	 */
-	@RequestMapping("multiple")
-	@ResponseBody
-	public Message uploadMultiple(HttpServletRequest request) {
-		return fileUpload.uploadMultiple(request);
-	}
-}
diff --git a/src/main/java/com/upload/Constant.java b/src/main/java/com/util/Constant.java
similarity index 91%
rename from src/main/java/com/upload/Constant.java
rename to src/main/java/com/util/Constant.java
index 41cd2dc..6f54626 100644
--- a/src/main/java/com/upload/Constant.java
+++ b/src/main/java/com/util/Constant.java
@@ -1,19 +1,19 @@
-package com.upload;
-
-/**
- * 系统常量
- * 
- * @author wujuan
- * 
- */
-public class Constant {
-
-	public static final String MSG_ERROR = "-1";
-	public static final String MSG_CONFLICT = "-2";
-	public static final String MSG_OK = "0";
-
-	public static final String OK_SYS = "成功";
-	public static final String ERROR_SYS = "系统错误";
-	public static final String ERROR_ANALY = "json解析错误";
-
-}
+package com.util;
+
+/**
+ * 系统常量
+ * 
+ * @author wujuan
+ * 
+ */
+public class Constant {
+
+	public static final String MSG_ERROR = "-1";
+	public static final String MSG_CONFLICT = "-2";
+	public static final String MSG_OK = "0";
+
+	public static final String OK_SYS = "成功";
+	public static final String ERROR_SYS = "系统错误";
+	public static final String ERROR_ANALY = "json解析错误";
+
+}
diff --git a/src/main/java/com/upload/FtpClient.java b/src/main/java/com/util/FtpClient.java
similarity index 94%
rename from src/main/java/com/upload/FtpClient.java
rename to src/main/java/com/util/FtpClient.java
index 1a725c4..662273d 100644
--- a/src/main/java/com/upload/FtpClient.java
+++ b/src/main/java/com/util/FtpClient.java
@@ -1,88 +1,86 @@
-package com.upload;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.enterprisedt.net.ftp.FTPClient;
-import com.enterprisedt.net.ftp.FTPConnectMode;
-import com.enterprisedt.net.ftp.FTPException;
-import com.enterprisedt.net.ftp.FTPTransferType;
-
-public class FtpClient {
-	private FTPClient ftpClient = null;
-
-	public void connectServer(String server, String user, String password) throws IOException, FTPException {
-		if (ftpClient == null || !ftpClient.connected()) {
-			ftpClient = new FTPClient();
-				ftpClient.setRemoteHost(server);
-				ftpClient.setTimeout(500000);
-				ftpClient.connect();
-				ftpClient.login(user, password);
-				ftpClient.setConnectMode(FTPConnectMode.PASV);
-				ftpClient.setType(FTPTransferType.BINARY);
-		}
-	}
-	
-	public void changeDir(String path) {
-		if (path == null || path.equals("")) {
-			return;
-		}
-		String temp[] = path.split("/");
-		for (int i = 0; i < temp.length; i++) {
-			try {
-				if (temp[i] == null || temp[i].equals("")) {
-					continue;
-				}
-				ftpClient.chdir(temp[i]);
-			} catch (FTPException fe) {
-				try {
-					ftpClient.mkdir(temp[i]);
-					ftpClient.chdir(temp[i]);
-				} catch (Exception e) {
-
-				}
-			} catch (Exception ee) {
-
-			}
-		}
-	}
-
-	public void uploadFile(InputStream in, String filename) {
-		try {
-			ftpClient.put(in, filename);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	public void uploadFile(byte[] bytes, String filename) {
-		try {
-			ftpClient.put(bytes, filename);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	public void downLoad(OutputStream out, String filename) {
-		try {
-			ftpClient.get(out, filename);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	public void close() {
-		try {
-			if (ftpClient != null && ftpClient.connected()) {
-				ftpClient.quit();
-				ftpClient = null;
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-}
+package com.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import com.enterprisedt.net.ftp.FTPClient;
+import com.enterprisedt.net.ftp.FTPConnectMode;
+import com.enterprisedt.net.ftp.FTPException;
+import com.enterprisedt.net.ftp.FTPTransferType;
+
+public class FtpClient {
+	private FTPClient ftpClient = null;
+
+	public void connectServer(String server, String user, String password) throws IOException, FTPException {
+		if (ftpClient == null || !ftpClient.connected()) {
+			ftpClient = new FTPClient();
+				ftpClient.setRemoteHost(server);
+				ftpClient.setTimeout(500000);
+				ftpClient.connect();
+				ftpClient.login(user, password);
+				ftpClient.setConnectMode(FTPConnectMode.PASV);
+				ftpClient.setType(FTPTransferType.BINARY);
+		}
+	}
+	
+	public void changeDir(String path) {
+		if (path == null || path.equals("")) {
+			return;
+		}
+		String temp[] = path.split("/");
+		for (int i = 0; i < temp.length; i++) {
+			try {
+				if (temp[i] == null || temp[i].equals("")) {
+					continue;
+				}
+				ftpClient.chdir(temp[i]);
+			} catch (FTPException fe) {
+				try {
+					ftpClient.mkdir(temp[i]);
+					ftpClient.chdir(temp[i]);
+				} catch (Exception e) {
+
+				}
+			} catch (Exception ee) {
+
+			}
+		}
+	}
+
+	public void uploadFile(InputStream in, String filename) {
+		try {
+			ftpClient.put(in, filename);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void uploadFile(byte[] bytes, String filename) {
+		try {
+			ftpClient.put(bytes, filename);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void downLoad(OutputStream out, String filename) {
+		try {
+			ftpClient.get(out, filename);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void close() {
+		try {
+			if (ftpClient != null && ftpClient.connected()) {
+				ftpClient.quit();
+				ftpClient = null;
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+}
diff --git a/src/main/java/com/util/ResultMapUtil.java b/src/main/java/com/util/ResultMapUtil.java
index 1f70a44..12d6020 100644
--- a/src/main/java/com/util/ResultMapUtil.java
+++ b/src/main/java/com/util/ResultMapUtil.java
@@ -18,7 +18,8 @@ public static Map<String,Object> getSuccessMap(Object obj) {
 	}
 	public static Map<String,Object> getSuccessMap(String msg,Object obj) {
 		Map<String,Object> map = Maps.newHashMap();
-		map.put("resultCode", 0);
+		map.put("resultCode", Constant.MSG_OK);
+		map.put("resultMsg", Constant.OK_SYS);
 		if(!StringUtils.isEmpty(msg))
 			map.put("resultMsg", msg);
 		if(obj!=null)
@@ -30,7 +31,8 @@ public static Map<String,Object> getFailMap() {
 	}
 	public static Map<String,Object> getFailMap(String msg) {
 		Map<String,Object> map = Maps.newHashMap();
-		map.put("resultCode", -1);
+		map.put("resultCode", Constant.MSG_ERROR);
+		map.put("resultMsg", Constant.ERROR_SYS);
 		if(!StringUtils.isEmpty(msg))
 			map.put("resultMsg", msg);
 		return map;
diff --git a/src/main/java/com/vm/controller/ProcurementController.java b/src/main/java/com/vm/controller/ProcurementController.java
index f2f96bb..5af951a 100644
--- a/src/main/java/com/vm/controller/ProcurementController.java
+++ b/src/main/java/com/vm/controller/ProcurementController.java
@@ -1,111 +1,95 @@
-package com.vm.controller;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.log4j.Logger;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
-
-import com.entity.Car;
-import com.entity.Procurement;
-import com.entity.Standard;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.upload.FileUpload;
-import com.upload.Message;
-import com.util.ResultMapUtil;
-import com.vm.service.ProcurementBiz;
-
-@Controller
-@RequestMapping("procurement.do")
-public class ProcurementController {
-	private Logger log = Logger.getLogger(ProcurementController.class);
-
-    @Autowired
-    private ProcurementBiz procBiz;
-    @Autowired
-	private FileUpload fileUpload;
-    
-    @RequiresPermissions("procurement:query")
-    @RequestMapping("procurement.view")
-    public String ProcurementViewForword(Model model) {
-        return "forward:/procurement.do/procurement.view/0/10";
-    }
-    
-    @RequiresPermissions("procurement:query")
-    @RequestMapping("procurement.view/{pageNum}/{pageSize}")
-    public String ProcurementView(Procurement procurement,Model m,@PathVariable("pageNum") int pageNum,
-    		@PathVariable("pageSize") int pageSize) {
-    	
-    	PageHelper.startPage(pageNum, pageSize);
-    	List<Procurement> list =  procBiz.find(procurement);
-    	PageInfo<Procurement> page = new PageInfo<Procurement>(list);
-        m.addAttribute("procurementList", list);
-        m.addAttribute("page", page);
-        return "/vm/procurement/procurement";
-    }
-    
-    @RequiresPermissions("procurement:add")
-    @RequestMapping("procurement_add.view")
-    public String procurementAddView(Model m) {
-    	
-        return "/vm/procurement/procurement_add";
-    }
-    @RequiresPermissions("procurement:add")
-    @RequestMapping("add")
-    public String add(Procurement procurement) {
-    	procBiz.add(procurement);
-        return "redirect:/procurement.do/procurement.view";
-    }
-    
-    @RequiresPermissions("procurement:update")
-    @RequestMapping("procurement_update.view")
-    public String procurementUpdateView(Long id,Model m) {
-    	m.addAttribute("procurement",procBiz.findById(id));
-        return "/vm/procurement/procurement_update";
-    }
-    
-    @RequiresPermissions("procurement:update")
-    @RequestMapping("update")
-    public String update(Procurement procurement) {
-    	procBiz.update(procurement);
-        return "redirect:/procurement.do/procurement.view";
-    }
-
-    @RequiresPermissions("procurement:delete")
-    @RequestMapping("delete")
-    public String delete(Long id) {
-    	procBiz.delete(id);
-        return "redirect:/procurement.do/procurement.view";
-    }
-    
-    @SuppressWarnings("resource")
-	@RequiresPermissions("procurement:import")
-    @RequestMapping("import")
-    @ResponseBody
-    @Transactional()
-    public Message imp(HttpServletRequest request){
-    	
-    	return fileUpload.fileUploadFile(request,"procurement");
-    }
-}
+package com.vm.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.log4j.Logger;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.entity.Procurement;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.vm.service.FileUploadBiz;
+import com.vm.service.ProcurementBiz;
+
+@Controller
+@RequestMapping("procurement.do")
+public class ProcurementController {
+	private Logger log = Logger.getLogger(ProcurementController.class);
+
+    @Autowired
+    private ProcurementBiz procBiz;
+    @Autowired
+	private FileUploadBiz fileUpload;
+    
+    @RequiresPermissions("procurement:query")
+    @RequestMapping("procurement.view")
+    public String ProcurementViewForword(Model model) {
+        return "forward:/procurement.do/procurement.view/0/10";
+    }
+    
+    @RequiresPermissions("procurement:query")
+    @RequestMapping("procurement.view/{pageNum}/{pageSize}")
+    public String ProcurementView(Procurement procurement,Model m,@PathVariable("pageNum") int pageNum,
+    		@PathVariable("pageSize") int pageSize) {
+    	
+    	PageHelper.startPage(pageNum, pageSize);
+    	List<Procurement> list =  procBiz.find(procurement);
+    	PageInfo<Procurement> page = new PageInfo<Procurement>(list);
+        m.addAttribute("procurementList", list);
+        m.addAttribute("page", page);
+        return "/vm/procurement/procurement";
+    }
+    
+    @RequiresPermissions("procurement:add")
+    @RequestMapping("procurement_add.view")
+    public String procurementAddView(Model m) {
+    	
+        return "/vm/procurement/procurement_add";
+    }
+    @RequiresPermissions("procurement:add")
+    @RequestMapping("add")
+    public String add(Procurement procurement) {
+    	procBiz.add(procurement);
+        return "redirect:/procurement.do/procurement.view";
+    }
+    
+    @RequiresPermissions("procurement:update")
+    @RequestMapping("procurement_update.view")
+    public String procurementUpdateView(Long id,Model m) {
+    	m.addAttribute("procurement",procBiz.findById(id));
+        return "/vm/procurement/procurement_update";
+    }
+    
+    @RequiresPermissions("procurement:update")
+    @RequestMapping("update")
+    public String update(Procurement procurement) {
+    	procBiz.update(procurement);
+        return "redirect:/procurement.do/procurement.view";
+    }
+
+    @RequiresPermissions("procurement:delete")
+    @RequestMapping("delete")
+    public String delete(Long id) {
+    	procBiz.delete(id);
+        return "redirect:/procurement.do/procurement.view";
+    }
+    
+	@RequiresPermissions("procurement:import")
+    @RequestMapping("import")
+    @ResponseBody
+    @Transactional()
+    public Map<String,Object> imp(HttpServletRequest request){
+    	
+    	return fileUpload.fileUploadFile(request);
+    }
+}
diff --git a/src/main/java/com/vm/controller/UploadController.java b/src/main/java/com/vm/controller/UploadController.java
new file mode 100644
index 0000000..a6b877c
--- /dev/null
+++ b/src/main/java/com/vm/controller/UploadController.java
@@ -0,0 +1,95 @@
+package com.vm.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.entity.FileInfo;
+import com.util.ResultMapUtil;
+import com.vm.service.FileUploadBiz;
+
+
+@Controller
+@RequestMapping("upload.do")
+public class UploadController {
+	private Logger log = Logger.getLogger(UploadController.class);
+
+	@Autowired
+	private FileUploadBiz fileUpload;
+	
+	
+	/**
+	 * 上传文件
+	 * 
+	 * @param request
+	 * @return
+	 */
+	@RequestMapping("file")
+	@ResponseBody
+	public Map<String,Object> uploadFile(HttpServletRequest request) {
+		return fileUpload.fileUploadFile(request);
+	}
+
+	/**
+	 * 上传图片
+	 * 
+	 * @param request
+	 * @return
+	 */
+	@RequestMapping("image")
+	@ResponseBody
+	public Map<String,Object> uploadImage(HttpServletRequest request) {
+		return fileUpload.fileUploadImage(request);
+	}
+	
+	/**
+	 * 多文件上传
+	 * 
+	 * @param request
+	 * @return
+	 */
+	@RequestMapping("multiple")
+	@ResponseBody
+	public Map<String,Object> uploadMultiple(HttpServletRequest request) {
+		return fileUpload.uploadMultiple(request);
+	}
+	
+	@RequestMapping("delete")
+	@ResponseBody
+	public Map<String, Object> delete(Long id) {
+		try {
+			fileUpload.delete(id);
+		} catch(Exception e) {
+			log.error("DeleteError",e);
+			return ResultMapUtil.getFailMap();
+		}
+		return ResultMapUtil.getSuccessMap();
+	}
+	
+	
+	@RequestMapping("query")
+	@ResponseBody
+    public Map<String, Object> query(Long id) {
+		FileInfo fileInfo = fileUpload.query(id);
+		return ResultMapUtil.getSuccessMap(fileInfo);
+    }
+	
+	@RequestMapping("queryByIds")
+	@ResponseBody
+    public Map<String, Object> query(String ids) {
+		try {
+			List<FileInfo> list = fileUpload.query(ids);
+			return ResultMapUtil.getSuccessMap(list);
+		} catch(Exception e) {
+			log.error("QueryError",e);
+			return ResultMapUtil.getFailMap(); 
+		}
+    }
+}
diff --git a/src/main/java/com/vm/dao/FileUploadDao.java b/src/main/java/com/vm/dao/FileUploadDao.java
new file mode 100644
index 0000000..1298653
--- /dev/null
+++ b/src/main/java/com/vm/dao/FileUploadDao.java
@@ -0,0 +1,13 @@
+package com.vm.dao;
+
+import java.util.List;
+
+import com.entity.FileInfo;
+
+public interface FileUploadDao {
+	public void add(FileInfo fileInfo);
+	public void delete(Long id);
+	public FileInfo findById(Long id);
+	public List<FileInfo> findAll();
+	public List<FileInfo> findByIds(List<Long> list);
+}
diff --git a/src/main/java/com/vm/service/FileUploadBiz.java b/src/main/java/com/vm/service/FileUploadBiz.java
new file mode 100644
index 0000000..f370061
--- /dev/null
+++ b/src/main/java/com/vm/service/FileUploadBiz.java
@@ -0,0 +1,57 @@
+package com.vm.service;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.entity.FileInfo;
+
+public interface FileUploadBiz {
+
+	/**
+	 * 上传文件
+	 * 
+	 * @param request
+	 * @param type 
+	 * @return
+	 */
+	public abstract Map<String,Object> fileUploadFile(HttpServletRequest request);
+
+	/**
+	 * 上传图片
+	 * 
+	 * @param request
+	 * @param category 
+	 * @return
+	 */
+	public abstract Map<String,Object> fileUploadImage(HttpServletRequest request);
+
+	/**
+	 * 文件上传
+	 * 
+	 * @param tenantCode
+	 * @param userAccount
+	 * @param request
+	 * @param type 
+	 * @return
+	 */
+	public abstract Map<String,Object> fileUpload(HttpServletRequest request, String allowTypes);
+
+	/**
+	 * 上传文件
+	 * 
+	 * @param request
+	 * @param category 
+	 * @param type 
+	 * @return
+	 */
+	public abstract Map<String,Object> uploadMultiple(HttpServletRequest request);
+
+	public abstract void delete(Long id);
+
+	public abstract FileInfo query(Long id);
+
+	public abstract List<FileInfo> query(String ids);
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/upload/FileUpload.java b/src/main/java/com/vm/service/impl/FileUploadBizImpl.java
similarity index 52%
rename from src/main/java/com/upload/FileUpload.java
rename to src/main/java/com/vm/service/impl/FileUploadBizImpl.java
index 9976fd2..4e2dd3d 100644
--- a/src/main/java/com/upload/FileUpload.java
+++ b/src/main/java/com/vm/service/impl/FileUploadBizImpl.java
@@ -1,321 +1,270 @@
-package com.upload;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URLEncoder;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.UUID;
-
-import javax.annotation.PostConstruct;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.fileupload.FileItemIterator;
-import org.apache.commons.fileupload.FileItemStream;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.multipart.commons.CommonsMultipartResolver;
-
-import com.enterprisedt.net.ftp.FTPException;
-
-/**
- * 多文件上传
- * 
- */
-@Component
-public class FileUpload {
-
-	private String ip;
-	private String readurl;
-	private String rootDir;
-	private String dir;
-	private String username;
-	private String password;
-	private static String allowFileTypes;
-	private static String allowImageTypes;
-	private static final String CONFIG_FILE_NAME = "upload.properties";
-	private Log logger = LogFactory.getLog(this.getClass());
-
-	@SuppressWarnings("unused")
-	@PostConstruct
-	private void init() {
-		Properties properties = new Properties();
-		try {
-			properties.load(FileUpload.class.getClassLoader()
-					.getResourceAsStream(CONFIG_FILE_NAME));
-			allowFileTypes = properties.getProperty("allowFileTypes");
-			allowFileTypes += allowFileTypes.toLowerCase();
-			allowImageTypes = properties.getProperty("allowImageTypes");
-			allowImageTypes += allowImageTypes.toLowerCase();
-			this.ip = properties.getProperty("ftp.ip");
-			this.dir = properties.getProperty("ftp.dir");
-			this.username = properties.getProperty("ftp.username");
-			this.password = properties.getProperty("ftp.password");
-			this.readurl = properties.getProperty("ftp.readurl");
-			this.rootDir = properties.getProperty("ftp.root");
-		} catch (Exception e) {
-			logger.error("加载配置文件出错！" + e.getMessage());
-		}
-	}
-
-	/**
-	 * 上传文件
-	 * 
-	 * @param request
-	 * @return
-	 */
-	public Message fileUploadFile(HttpServletRequest request,String type) {
-		return this.fileUpload(request,type, allowFileTypes);
-	}
-
-	/**
-	 * 上传图片
-	 * 
-	 * @param request
-	 * @return
-	 */
-	public Message fileUploadImage(HttpServletRequest request,String type) {
-		return this.fileUpload(request,type, allowImageTypes);
-	}
-
-	/**
-	 * 文件上传
-	 * 
-	 * @param tenantCode
-	 * @param userAccount
-	 * @param request
-	 * @return
-	 */
-	public Message fileUpload(HttpServletRequest request,String type, String allowTypes) {
-
-		Message msg = new Message();
-		msg.setResultCode(Constant.MSG_ERROR);
-		try {
-			// 上传文件的解析器
-			CommonsMultipartResolver mutiparRe = new CommonsMultipartResolver();
-			if (mutiparRe.isMultipart(request)) {
-				// 保存文件信息
-				List<FileInfo> fileInfo = new ArrayList<FileInfo>();
-				MultipartHttpServletRequest mhr = (MultipartHttpServletRequest) request;
-
-				Iterator<String> it = mhr.getFileNames();
-				if (it.hasNext()) {
-					MultipartFile mf = mhr.getFile(it.next());
-					if (mf != null) {
-						String date = null;
-						String dateDir = null;
-						String resFileName = mf.getOriginalFilename();
-						date = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
-						dateDir = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
-						String fileName = rename(resFileName, date);
-						String fileType = fileName.substring(fileName.lastIndexOf(".") + 1);
-						String filePath = this.rootDir +this.dir+"/"+ type +"/"+ dateDir;
-						
-						if (StringUtils.isEmpty(allowTypes)
-								|| allowTypes.indexOf(fileType) > -1) {
-							FtpClient client = null;
-							try {
-								// 上传ftp
-								client = getFtpCilent(filePath);
-								fileName = URLEncoder.encode(fileName, "utf-8");
-								client.uploadFile(mf.getInputStream(), fileName);
-								FileInfo file = new FileInfo();
-								file.setFileName(fileName);
-								file.setFilePath(this.readurl + this.dir+"/"+dateDir + "/" + fileName);
-								file.setFileType(fileType);
-								file.setUploadTime(date);
-								file.setOriginalFilename(resFileName);
-								
-								fileInfo.add(file);
-								msg.setData(file);
-								msg.setUploadType(type);
-								msg.setResultMsg(Constant.OK_SYS);
-								msg.setResultCode(Constant.MSG_OK);
-							} catch (Exception e) {
-								msg.setResultMsg("上传失败：" + e.getMessage());
-								logger.error("上传失败：" + e.getMessage());
-							} finally {
-								if (client != null)
-									client.close();
-							}
-						} else {
-							msg.setResultMsg("上传失败：非法的文件类型，目前只支持" + allowTypes + "类型");
-						}
-					} else {
-						msg.setResultMsg("上传失败：无效文件");
-					}
-				} else {
-					msg.setResultMsg("上传失败：无效文件");
-				}
-
-			} else {
-				msg.setResultMsg("上传失败：请求类型错误");
-			}
-		} catch (Exception e) {
-			msg.setResultMsg("上传失败：" + e.getMessage());
-			logger.error("上传失败：", e);
-		}
-		return msg;
-	}
-	
-	public Message uploadStream(HttpServletRequest request){
-		Message msg = new Message();
-		msg.setResultCode(Constant.MSG_ERROR);
-		FtpClient client = null;
-		InputStream is = null;
-		try {
-			Date date = new Date();
-			String fileType = ".jpg";
-			String fileName = new SimpleDateFormat("yyyyMMddHHmmss").format(date) + "_" + date.getTime() + fileType;
-
-			FileItemStream fileStream = null;
-			ServletFileUpload upload = new ServletFileUpload(new DiskFileItemFactory());
-			upload.setHeaderEncoding("utf-8");
-			FileItemIterator iterator = upload.getItemIterator(request);
-
-		    while (iterator.hasNext()) {
-		        fileStream = iterator.next();
-		        if (!(fileStream.isFormField()))
-		          break;
-		        fileStream = null;
-		     }
-		     if (fileStream == null) {
-		    	 msg.setResultMsg("上传失败");
-		    	 logger.error("上传失败");
-		     }
-		    is = fileStream.openStream();
-		      
-			client = getFtpCilent("");
-			client.uploadFile(is, fileName);
-			FileInfo file = new FileInfo();
-			file.setFileName(fileName);
-			file.setFilePath(this.readurl + this.dir + "/" + fileName);
-			file.setFileType(fileType);
-			file.setUploadTime(new SimpleDateFormat("yyyyMMddHHmmss").format(date));
-
-			msg.setData(file);
-			msg.setResultMsg(Constant.OK_SYS);
-			msg.setResultCode(Constant.MSG_OK);
-		} catch (Exception e) {
-			msg.setResultMsg("上传失败：" + e.getMessage());
-			logger.error("上传失败：" + e.getMessage());
-		} finally {
-			if(is != null)
-				try {
-					is.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			if (client != null)
-				client.close();
-		}
-		return msg;
-	}
-	
-	/**
-	 * 上传文件
-	 * 
-	 * @param request
-	 * @return
-	 */
-	public Message uploadMultiple(HttpServletRequest request) {
-		Message msg = new Message();
-		msg.setResultCode(Constant.MSG_ERROR);
-		FtpClient client = null;
-		try {
-			// 上传文件的解析器
-			CommonsMultipartResolver mutiparRe = new CommonsMultipartResolver();
-			if (mutiparRe.isMultipart(request)) {
-				MultipartHttpServletRequest mhr = (MultipartHttpServletRequest) request;
-
-				Iterator<String> it = mhr.getFileNames();
-				List<FileInfo> fileInfo = new ArrayList<FileInfo>();
-				if(it.hasNext()){
-					client = getFtpCilent("");
-					while (it.hasNext()) {
-						FileInfo file = new FileInfo();
-						try {
-							MultipartFile mf = mhr.getFile(it.next());
-							if (mf != null) {
-								file.setUuid(mf.getName());
-								String date = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
-								String resFileName = mf.getOriginalFilename();
-								String fileName = rename(resFileName, date);
-								String fileType = fileName.substring(fileName.lastIndexOf(".") + 1);
-
-								fileName = URLEncoder.encode(fileName, "utf-8");
-								if(StringUtils.isNotEmpty(fileName)){
-									//解决中文无法访问的问题
-									fileName = fileName.replace("%","-");
-								}
-
-								client.uploadFile(mf.getInputStream(), fileName);
-								file.setFileName(fileName);
-								file.setFilePath(this.readurl + this.dir + "/" + fileName);
-										//+ URLEncoder.encode(fileName, "utf-8"));
-								file.setFileType(fileType);
-								file.setUploadTime(date);
-								file.setOriginalFilename(resFileName);
-
-								fileInfo.add(file);
-							} else {
-								file.setErrorMsg("上传失败：无效文件");
-							}
-						} catch (Exception e) {
-							file.setErrorMsg("上传失败：" + e.getMessage());
-							logger.error("上传失败：" + e.getMessage());
-						} 
-					} 
-					msg.setData(fileInfo);
-					msg.setResultMsg(Constant.OK_SYS);
-					msg.setResultCode(Constant.MSG_OK);
-				}else {
-					msg.setResultMsg("上传失败：无效文件");
-				}
-			}else {
-				msg.setResultMsg("上传失败：请求类型错误");
-			}
-		} catch (Exception e) {
-			msg.setResultMsg("上传失败：" + e.getMessage());
-			logger.error("上传失败：", e);
-		}finally {
-			if (client != null)
-				client.close();
-		}
-		return msg;
-	}
-	
-	public FtpClient getFtpCilent(String filePath) throws IOException, FTPException {
-		FtpClient client = new FtpClient();
-		client.connectServer(this.ip, this.username, this.password);
-		client.changeDir(filePath);
-		return client;
-	}
-
-	public String rename(String name, String date) {
-		String uustr = name.substring(0, name.lastIndexOf("."));
-		uustr = uustr + "_" + date + "_" + UUID.randomUUID();
-		if (name.indexOf(".") != -1) {
-			uustr += name.substring(name.lastIndexOf("."));
-		}
-		return uustr;
-	}
-
-	public static String getAllowFileTypes() {
-		return allowFileTypes;
-	}
-
-	public static String getAllowImageTypes() {
-		return allowImageTypes;
-	}
+package com.vm.service.impl;
+
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.UUID;
+
+import javax.annotation.PostConstruct;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
+
+import com.enterprisedt.net.ftp.FTPException;
+import com.entity.FileInfo;
+import com.google.common.collect.Lists;
+import com.util.FtpClient;
+import com.util.ResultMapUtil;
+import com.vm.dao.FileUploadDao;
+import com.vm.service.FileUploadBiz;
+
+/**
+ * 多文件上传
+ * 
+ */
+@Service
+public class FileUploadBizImpl implements FileUploadBiz {
+
+	private String ip;
+	private String readurl;
+	private String rootDir;
+	private String username;
+	private String password;
+	private static String allowFileTypes;
+	private static String allowImageTypes;
+	private static final String CONFIG_FILE_NAME = "upload.properties";
+	private Log logger = LogFactory.getLog(this.getClass());
+	
+	@Autowired
+	private FileUploadDao fileUploadDao;
+
+	@PostConstruct
+	private void init() {
+		Properties properties = new Properties();
+		try {
+			properties.load(FileUploadBizImpl.class.getClassLoader()
+					.getResourceAsStream(CONFIG_FILE_NAME));
+			allowFileTypes = properties.getProperty("allowFileTypes");
+			allowFileTypes += allowFileTypes.toLowerCase();
+			allowImageTypes = properties.getProperty("allowImageTypes");
+			allowImageTypes += allowImageTypes.toLowerCase();
+			this.ip = properties.getProperty("ftp.ip");
+			this.username = properties.getProperty("ftp.username");
+			this.password = properties.getProperty("ftp.password");
+			this.readurl = properties.getProperty("ftp.readurl");
+			this.rootDir = properties.getProperty("ftp.root");
+		} catch (Exception e) {
+			logger.error("加载配置文件出错！" + e.getMessage());
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see com.vm.service.impl.FileUploadBiz#fileUploadFile(javax.servlet.http.HttpServletRequest, com.entity.enumeration.FtpUploadType, java.lang.String)
+	 */
+	@Override
+	public Map<String,Object> fileUploadFile(HttpServletRequest request) {
+		return this.fileUpload(request, allowFileTypes);
+	}
+
+	/* (non-Javadoc)
+	 * @see com.vm.service.impl.FileUploadBiz#fileUploadImage(javax.servlet.http.HttpServletRequest, com.entity.enumeration.FtpUploadType, java.lang.String)
+	 */
+	@Override
+	public Map<String,Object> fileUploadImage(HttpServletRequest request) {
+		return this.fileUpload(request, allowImageTypes);
+	}
+
+	/* (non-Javadoc)
+	 * @see com.vm.service.impl.FileUploadBiz#fileUpload(javax.servlet.http.HttpServletRequest, com.entity.enumeration.FtpUploadType, java.lang.String, java.lang.String)
+	 */
+	@Override
+	public Map<String,Object> fileUpload(HttpServletRequest request, String allowTypes) {
+		Map<String,Object> msg = null;
+		try {
+			// 上传文件的解析器
+			CommonsMultipartResolver mutiparRe = new CommonsMultipartResolver();
+			if (mutiparRe.isMultipart(request)) {
+				MultipartHttpServletRequest mhr = (MultipartHttpServletRequest) request;
+
+				Iterator<String> it = mhr.getFileNames();
+				if (it.hasNext()) {
+					MultipartFile mf = mhr.getFile(it.next());
+					if (mf != null) {
+						String resFileName = mf.getOriginalFilename();
+						String date = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
+						String dateDir = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+						String fileName = rename(resFileName);
+						String fileType = fileName.substring(fileName.lastIndexOf(".") + 1);
+						String filePath = this.rootDir + "/" +dateDir;
+						
+						if (StringUtils.isEmpty(allowTypes)
+								|| allowTypes.indexOf(fileType) > -1) {
+							FtpClient client = null;
+							try {
+								// 上传ftp
+								client = getFtpCilent(filePath);
+								fileName = URLEncoder.encode(fileName, "utf-8");
+								client.uploadFile(mf.getInputStream(), fileName);
+								FileInfo file = new FileInfo();
+								file.setFileName(fileName);
+								file.setFilePath(this.readurl + filePath + "/" + fileName);
+								file.setFileType(fileType);
+								file.setUploadTime(date);
+								file.setOriginalFilename(resFileName);
+								
+								fileUploadDao.add(file);
+								
+								msg = ResultMapUtil.getSuccessMap(file);
+							} catch (Exception e) {
+								msg = ResultMapUtil.getFailMap("上传失败：" + e.getMessage());
+								logger.error("上传失败：" + e.getMessage());
+							} finally {
+								if (client != null)
+									client.close();
+							}
+						} else {
+							msg = ResultMapUtil.getFailMap("上传失败：非法的文件类型，目前只支持" + allowTypes + "类型");
+						}
+					} else {
+						msg = ResultMapUtil.getFailMap("上传失败：无效文件");
+					}
+				} else {
+					msg = ResultMapUtil.getFailMap("上传失败：无效文件");
+				}
+			} else {
+				msg = ResultMapUtil.getFailMap("上传失败：请求类型错误");
+			}
+		} catch (Exception e) {
+			msg = ResultMapUtil.getFailMap("上传失败：" + e.getMessage());
+			logger.error("上传失败：", e);
+		}
+		return msg;
+	}
+	
+	@Override
+	public Map<String,Object> uploadMultiple(HttpServletRequest request) {
+		Map<String,Object> msg = null;
+		FtpClient client = null;
+		try {
+			// 上传文件的解析器
+			CommonsMultipartResolver mutiparRe = new CommonsMultipartResolver();
+			if (mutiparRe.isMultipart(request)) {
+				MultipartHttpServletRequest mhr = (MultipartHttpServletRequest) request;
+
+				Iterator<String> it = mhr.getFileNames();
+				List<FileInfo> fileInfo = new ArrayList<FileInfo>();
+				if(it.hasNext()){
+					client = getFtpCilent("");
+					while (it.hasNext()) {
+						FileInfo file = new FileInfo();
+						try {
+							MultipartFile mf = mhr.getFile(it.next());
+							if (mf != null) {
+								file.setUuid(mf.getName());
+								String date = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
+								String dateDir = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+								String resFileName = mf.getOriginalFilename();
+								String fileName = rename(resFileName);
+								String fileType = fileName.substring(fileName.lastIndexOf(".") + 1);
+								String filePath = this.rootDir + "/" +dateDir;
+								client.changeDir(filePath);
+
+								fileName = URLEncoder.encode(fileName, "utf-8");
+								if(StringUtils.isNotEmpty(fileName)){
+									//解决中文无法访问的问题
+									fileName = fileName.replace("%","-");
+								}
+
+								client.uploadFile(mf.getInputStream(), fileName);
+								file.setFileName(fileName);
+								file.setFilePath(this.readurl + filePath + "/" + fileName);
+								file.setFileType(fileType);
+								file.setUploadTime(date);
+								file.setOriginalFilename(resFileName);
+
+								fileUploadDao.add(file);
+								
+								fileInfo.add(file);
+							} else {
+								msg = ResultMapUtil.getFailMap("上传失败：无效文件");
+							}
+						} catch (Exception e) {
+							msg = ResultMapUtil.getFailMap("上传失败：无效文件");
+							logger.error("上传失败：" + e.getMessage());
+						} 
+					}
+					msg = ResultMapUtil.getSuccessMap(fileInfo);
+				}else {
+					msg = ResultMapUtil.getFailMap("上传失败：无效文件");
+				}
+			}else {
+				msg = ResultMapUtil.getFailMap("上传失败：请求类型错误");
+			}
+		} catch (Exception e) {
+			msg = ResultMapUtil.getFailMap("上传失败：" + e.getMessage());
+			logger.error("上传失败：", e);
+		}finally {
+			if (client != null)
+				client.close();
+		}
+		return msg;
+	}
+	
+	@Override
+	public void delete(Long id) {
+		fileUploadDao.delete(id);
+	}
+
+	@Override
+	public FileInfo query(Long id) {
+		return fileUploadDao.findById(id);
+	}
+
+	@Override
+	public List<FileInfo> query(String ids) {
+		if(StringUtils.isEmpty(ids)) {
+			return Lists.newArrayList();
+		}
+		List<Long> list = Lists.newArrayList();
+		for(String id : ids.split(",")) {
+			list.add(Long.parseLong(id));
+		}
+		return fileUploadDao.findByIds(list);
+	}
+
+	public FtpClient getFtpCilent(String filePath) throws IOException, FTPException {
+		FtpClient client = new FtpClient();
+		client.connectServer(this.ip, this.username, this.password);
+		client.changeDir(filePath);
+		return client;
+	}
+
+	public String rename(String name) {
+		String uustr = UUID.randomUUID().toString();
+		if (name.indexOf(".") != -1) {
+			uustr += name.substring(name.lastIndexOf("."));
+		}
+		return uustr;
+	}
+
+	public static String getAllowFileTypes() {
+		return allowFileTypes;
+	}
+
+	public static String getAllowImageTypes() {
+		return allowImageTypes;
+	}
 }
\ No newline at end of file
diff --git a/src/main/resources/mapper/FileUploadDao.xml b/src/main/resources/mapper/FileUploadDao.xml
new file mode 100644
index 0000000..50a7f20
--- /dev/null
+++ b/src/main/resources/mapper/FileUploadDao.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+
+<mapper namespace="com.vm.dao.FileUploadDao">
+
+    <resultMap id="fileinfo_map" type="FileInfo">
+        <id property="id" column="id"/>
+        <result property="fileName" column="file_name"/>
+        <result property="filePath" column="file_path"/>
+        <result property="fileType" column="file_type"/>
+        <result property="originalFilename" column="original_filename"/>
+        <result property="uuid" column="uuid"/>
+        <result property="uploadTime" column="upload_time"/>
+    </resultMap>
+
+
+    <select id="findAll" resultMap="fileinfo_map">
+        SELECT * FROM fileupload
+    </select>
+
+    <select id="findById" parameterType="long" resultMap="fileinfo_map">
+        SELECT * FROM fileupload WHERE id = #{value}
+    </select>
+    
+    <select id="findByIds" parameterType="list" resultMap="fileinfo_map">
+        SELECT * FROM fileupload 
+        where id in
+        <foreach collection="list" separator="," open="(" close=")" item="id">
+        	#{id}
+        </foreach>
+    </select>
+
+    <insert id="add" parameterType="FileInfo" useGeneratedKeys="true" keyProperty="id">
+        INSERT INTO fileupload(file_name,file_path,file_type,original_filename,uuid,upload_time) 
+        VALUES(#{fileName},#{filePath},#{fileType},#{originalFilename},#{uuid},#{uploadTime})
+    </insert>
+
+    <delete id="delete" parameterType="long">
+        DELETE FROM fileupload WHERE id = #{id}
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/spring/spring-mvc.xml b/src/main/resources/spring/spring-mvc.xml
index 07e554d..1612b45 100644
--- a/src/main/resources/spring/spring-mvc.xml
+++ b/src/main/resources/spring/spring-mvc.xml
@@ -47,8 +47,8 @@
             <bean id="fastJsonHttpMessageConverter" class="com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter">
                 <property name="supportedMediaTypes">
                     <list>
-                        <value>application/json;charset=UTF-8</value>
                         <value>text/html;charset=UTF-8</value>
+                        <value>application/json;charset=UTF-8</value>
                         <value>text/plain;charset=UTF-8</value>
                     </list>
                 </property>
diff --git a/src/main/resources/upload.properties b/src/main/resources/upload.properties
index 0d77d08..0c05479 100644
--- a/src/main/resources/upload.properties
+++ b/src/main/resources/upload.properties
@@ -1,9 +1,9 @@
-allowFileTypes=.TXT,.DOC,.DOCX,.XLS,.XLSX,.PDF,.GIF,.PNG,.JPG,.JPEG,.BMP
-allowImageTypes=.GIF,.PNG,.JPG,.JPEG,.BMP
-allowAnnexTypes=.TXT,.DOC,.DOCX,.XLS,.XLSX,.PDF,.GIF,.PNG,.JPG,.JPEG,.BMP
-ftp.ip=114.55.150.82
-ftp.root=
-ftp.dir=ag
-ftp.username=ftp_pg
-ftp.password=ftp_pg_123
-ftp.readurl=http://114.55.150.82:19210/ServiceInvoker/common/file/
+allowFileTypes=.TXT,.DOC,.DOCX,.XLS,.XLSX,.PDF,.GIF,.PNG,.JPG,.JPEG,.BMP
+allowImageTypes=.GIF,.PNG,.JPG,.JPEG,.BMP
+allowAnnexTypes=.TXT,.DOC,.DOCX,.XLS,.XLSX,.PDF,.GIF,.PNG,.JPG,.JPEG,.BMP
+ftp.ip=114.55.150.82
+ftp.root=0
+ftp.username=ftpadmin
+ftp.password=ftpadmin
+
+ftp.readurl=ftp\://114.55.150.82/
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/view/admin/batchUpload.jsp b/src/main/webapp/WEB-INF/view/admin/batchUpload.jsp
index 6eb03c2..b7227ec 100644
--- a/src/main/webapp/WEB-INF/view/admin/batchUpload.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/batchUpload.jsp
@@ -1,29 +1,32 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-
-<div class="modal fade" id="uploadModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-<div class="modal-dialog">
-	<div class="modal-content">
-		<div class="modal-header">
-			<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
-				&times;
-			</button>
-			<h4 class="modal-title" id="myModalLabel">
-				批量上传
-			</h4>
-		</div>
-		<div class="modal-body">
-			<form id="uploadForm" role="form" class="form-inline">
-				<div class="form-group">
-				    <label class="sr-only" for="file">文件输入</label>
-  						<input type="file" id="file" name="file" class="form-control">
-			  	</div>
- 						<button type="submit" class="btn btn-default">上传</button>
- 						<a class="btn btn-default hidden modaldownBtn">模板下载</a>
-			</form>
-		</div>
-		<div class="modal-footer">
-			<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-		</div>
-	</div><!-- /.modal-content -->
-</div><!-- /.modal -->
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+<div class="modal fade" id="uploadModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+<div class="modal-dialog">
+	<div class="modal-content">
+		<div class="modal-header">
+			<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+				&times;
+			</button>
+			<h4 class="modal-title" id="myModalLabel">
+				文件上传
+			</h4>
+		</div>
+		<div class="modal-body">
+			<form id="uploadForm" role="form" class="form-inline">
+				<input type="hidden" name="contextPath" value="${pageContext.request.contextPath}" formenctype="multipart/form-data"/>
+				<div class="form-group">
+				    <label class="sr-only" for="file">文件输入</label>
+  						<input type="file" id="file" name="file" class="form-control">
+			  	</div>
+				<button type="submit" class="btn btn-default">上传</button>
+				<a class="btn btn-default hidden modaldownBtn" download>模板下载</a>
+			</form>
+			<div class="container hidden attachmentArea">
+			</div>
+		</div>
+		<div class="modal-footer">
+			<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+		</div>
+	</div><!-- /.modal-content -->
+</div><!-- /.modal -->
 </div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/view/admin/nav.jsp b/src/main/webapp/WEB-INF/view/admin/nav.jsp
index 560918a..b6979b2 100644
--- a/src/main/webapp/WEB-INF/view/admin/nav.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/nav.jsp
@@ -38,7 +38,7 @@
     <link href="${pageContext.request.contextPath}/bower_components/sweetalert/sweetalert.css"
           rel="stylesheet" type="text/css">
           
-   <link href="${pageContext.request.contextPath}/css/Splitbutton.css" rel="stylesheet" type="text/css">       
+   <link href="${pageContext.request.contextPath}/css/style.css" rel="stylesheet" type="text/css">       
     
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you util the page via file:// -->
@@ -46,13 +46,6 @@
     <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
     <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
-	
-	<style>
-		.breadcrumb {
-		    margin: 5px -10px -20px -10px;
-   			background-color: rgb(255, 255, 255);
-	    }
-	</style>
 </head>
 <body>
     <!-- Navigation -->
diff --git a/src/main/webapp/WEB-INF/view/vm/agent/agent.jsp b/src/main/webapp/WEB-INF/view/vm/agent/agent.jsp
index baa85d9..a1d8105 100644
--- a/src/main/webapp/WEB-INF/view/vm/agent/agent.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/agent/agent.jsp
@@ -44,7 +44,9 @@
                                 <div class="form-group">
                                 	<div class="col-sm-2">
                                 		<a href="${pageContext.request.contextPath}/agent.do/agent_add.view" class="btn btn-primary" role="button">新增</a>
-                                		<button type="button" class="btn btn-primary" onclick="uploader.uploadModal('${pageContext.request.contextPath}/agent.do/import','${pageContext.request.contextPath}/template/agent_tpl.xlsx')">批量上传</button>
+                                		<button type="button" class="btn btn-primary" 
+                                			onclick="uploader.importModal({uploadUrl:'/agent.do/import',tempUrl:'/template/agent_tpl.xlsx',type:[{word:['excel']}]})">
+                                		批量上传</button>
                                 	</div>
                                 	<label class="col-sm-8 control-label"></label>
                                 	<div id="searchBtns" style="display:none;">
diff --git a/src/main/webapp/WEB-INF/view/vm/car/car.jsp b/src/main/webapp/WEB-INF/view/vm/car/car.jsp
index a023458..7ecd3c2 100644
--- a/src/main/webapp/WEB-INF/view/vm/car/car.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/car/car.jsp
@@ -57,7 +57,9 @@
                                 <div class="form-group">
                                 	<div class="col-sm-2">
                                 		<a href="${pageContext.request.contextPath}/car.do/car_add.view" class="btn btn-primary" role="button">新增</a>
-                                		<button type="button" class="btn btn-primary" onclick="uploader.uploadModal('${pageContext.request.contextPath}/car.do/import','${pageContext.request.contextPath}/template/car_tpl.xlsx')">批量上传</button>
+                                		<button type="button" class="btn btn-primary" 
+                                			onclick="uploader.importModal({uploadUrl:'/car.do/import',tempUrl:'/template/car_tpl.xlsx',type:[{word:['excel']}]})">
+                                		批量上传</button>
                                 	</div>
                                 	<label class="col-sm-8 control-label"></label>
                                 	<div id="searchBtns" style="display:none;">
diff --git a/src/main/webapp/WEB-INF/view/vm/procurement/procurement.jsp b/src/main/webapp/WEB-INF/view/vm/procurement/procurement.jsp
index f1e2d97..b338241 100644
--- a/src/main/webapp/WEB-INF/view/vm/procurement/procurement.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/procurement/procurement.jsp
@@ -1,111 +1,111 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
-<!-- Page Content -->
-<div id="page-wrapper">
-    <div class="container-fluid">
-    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
-        <div class="panel-heading">
-        </div>
-        <div class="row">
-            <div class="col-lg-12">
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                       采购管理
-                    </div>
-                    <!-- /.panel-heading -->
-                    <div class="panel-body">
-                        <div class="dataTable_wrapper">
-                        	<form class="searchForm form-horizontal" action="${pageContext.request.contextPath}/procurement.do/procurement.view/" method="post">
-                        		<button type="button" class="btn btn-default pull-right" id="toggle-advanced-search">查询条件<i class="fa fa-angle-double-down"></i></button>
-                        		<div class="clearfix"></div>
-                        		<div class="row-fluid" id="div-advanced-search" style="display:none;">
-                        		<div class="form-group">
-                        			<label class="col-sm-1 control-label">采购编号</label>
-	                                <div class="col-sm-2">
-	                                	<input class="form-control" type="number" name="procureId" value="${procurement.procureId }">
-	                                </div>
-	                                <label class="col-sm-1 control-label">采购时间</label>
-	                                <div class="col-sm-2">
-	                                	<input class="form-control" type="datetime-local" name="startTime" value="${procurement.startTime }">
-	                                </div>
-	                                <div class="col-sm-2">
-	                                	<input class="form-control" type="datetime-local" name=endTime value="${procurement.endTime }">
-	                                </div>
-                        		</div>
-                        		<div class="form-group">
-	                                <label class="col-sm-1 control-label">库存量</label>
-	                                <div class="col-sm-2">
-	                                	<input class="form-control" type="number" name="startInventory" value="${procurement.startInventory }">
-	                                </div>
-	                                <div class="col-sm-2">
-	                                	<input class="form-control" type="number" name=endInventory value="${procurement.endInventory }">
-	                                </div>
-	                                <label class="col-sm-1 control-label">采购价格</label>
-	                                <div class="col-sm-2">
-	                                	<input class="form-control" type="number" name="startPrice" value="${procurement.startPrice }">
-	                                </div>
-	                                <div class="col-sm-2">
-	                                	<input class="form-control" type="number" name="endPrice" value="${procurement.endPrice }">
-	                                </div>
-                                </div>
-                                </div>
-                                <div class="form-group">
-                                	<div class="col-sm-2">
-                                		<a href="${pageContext.request.contextPath}/procurement.do/procurement_add.view" class="btn btn-primary" role="button">新增</a>
-                                	</div>
-                                	<label class="col-sm-8 control-label"></label>
-                                	<div id="searchBtns" style="display:none;">
-                                	<div class="col-sm-1">
-                                		<button type="button" class="btn btn-primary form-control searchBtn">查询</button>
-                                	</div>
-                                	<div class="col-sm-1">
-                                		<button type="reset" class="btn btn-primary form-control">重置</button>
-                                	</div>
-                                	</div>
-
-                                </div>
-                            <table class="table table-striped table-bordered table-hover" id="dataTables-example">
-                                <thead>
-                                <tr>
-                                    <th>采购单编号</th>
-                                    <th>采购时间</th>
-                                    <th>采购量</th>
-                                    <th>采购价格</th>
-                                    <th>操作</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <c:forEach var="procurement" items="${procurementList}">
-                                    <tr>
-                                        <td>${procurement.procureId}</td>
-                                        <td>${procurement.procureTime}</td>
-                                        <td>${procurement.inventory}</td>
-                                        <td>${procurement.price}</td>
-                                        <td>
-                                            <a href="${pageContext.request.contextPath}/procurement.do/procurement_update.view?id=${procurement.id}">修改</a>
-                                            <a href="${pageContext.request.contextPath}/procurement.do/delete?id=${procurement.id}"
-                                               onclick="return confirm('是否要删除该采购单')">删除</a>
-                                        </td>
-                                    </tr>
-                                </c:forEach>
-                                </tbody>
-                            </table>               
-                             <jsp:include page="/WEB-INF/view/admin/pageSplit.jsp"></jsp:include>
-                             </form:form>
-                        </div>
-                        <!-- /.table-responsive -->
-                    </div>
-                    <!-- /.panel-body -->
-                </div>
-                <!-- /.panel -->
-            </div>
-            <!-- /.col-lg-12 -->
-        </div>
-    </div>
-
-    <!-- /.container-fluid -->
-</div>
-
-<jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
-
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<jsp:include page="/WEB-INF/view/admin/nav.jsp"></jsp:include>
+<!-- Page Content -->
+<div id="page-wrapper">
+    <div class="container-fluid">
+    	<jsp:include page="/WEB-INF/view/admin/breadcrumb.jsp"></jsp:include>
+        <div class="panel-heading">
+        </div>
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                       采购管理
+                    </div>
+                    <!-- /.panel-heading -->
+                    <div class="panel-body">
+                        <div class="dataTable_wrapper">
+                        	<form class="searchForm form-horizontal" action="${pageContext.request.contextPath}/procurement.do/procurement.view/" method="post">
+                        		<button type="button" class="btn btn-default pull-right" id="toggle-advanced-search">查询条件<i class="fa fa-angle-double-down"></i></button>
+                        		<div class="clearfix"></div>
+                        		<div class="row-fluid" id="div-advanced-search" style="display:none;">
+                        		<div class="form-group">
+                        			<label class="col-sm-1 control-label">采购编号</label>
+	                                <div class="col-sm-2">
+	                                	<input class="form-control" type="number" name="procureId" value="${procurement.procureId }">
+	                                </div>
+	                                <label class="col-sm-1 control-label">采购时间</label>
+	                                <div class="col-sm-2">
+	                                	<input class="form-control" type="datetime-local" name="startTime" value="${procurement.startTime }">
+	                                </div>
+	                                <div class="col-sm-2">
+	                                	<input class="form-control" type="datetime-local" name=endTime value="${procurement.endTime }">
+	                                </div>
+                        		</div>
+                        		<div class="form-group">
+	                                <label class="col-sm-1 control-label">库存量</label>
+	                                <div class="col-sm-2">
+	                                	<input class="form-control" type="number" name="startInventory" value="${procurement.startInventory }">
+	                                </div>
+	                                <div class="col-sm-2">
+	                                	<input class="form-control" type="number" name=endInventory value="${procurement.endInventory }">
+	                                </div>
+	                                <label class="col-sm-1 control-label">采购价格</label>
+	                                <div class="col-sm-2">
+	                                	<input class="form-control" type="number" name="startPrice" value="${procurement.startPrice }">
+	                                </div>
+	                                <div class="col-sm-2">
+	                                	<input class="form-control" type="number" name="endPrice" value="${procurement.endPrice }">
+	                                </div>
+                                </div>
+                                </div>
+                                <div class="form-group">
+                                	<div class="col-sm-2">
+                                		<a href="${pageContext.request.contextPath}/procurement.do/procurement_add.view" class="btn btn-primary" role="button">新增</a>
+                                	</div>
+                                	<label class="col-sm-8 control-label"></label>
+                                	<div id="searchBtns" style="display:none;">
+                                	<div class="col-sm-1">
+                                		<button type="button" class="btn btn-primary form-control searchBtn">查询</button>
+                                	</div>
+                                	<div class="col-sm-1">
+                                		<button type="reset" class="btn btn-primary form-control">重置</button>
+                                	</div>
+                                	</div>
+
+                                </div>
+                            <table class="table table-striped table-bordered table-hover" id="dataTables-example">
+                                <thead>
+                                <tr>
+                                    <th>采购单编号</th>
+                                    <th>采购时间</th>
+                                    <th>采购量</th>
+                                    <th>采购价格</th>
+                                    <th>操作</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <c:forEach var="procurement" items="${procurementList}">
+                                    <tr>
+                                        <td>${procurement.procureId}</td>
+                                        <td>${procurement.procureTime}</td>
+                                        <td>${procurement.inventory}</td>
+                                        <td>${procurement.price}</td>
+                                        <td>
+                                            <a href="${pageContext.request.contextPath}/procurement.do/procurement_update.view?id=${procurement.id}">修改</a>
+                                            <a href="${pageContext.request.contextPath}/procurement.do/delete?id=${procurement.id}"
+                                               onclick="return confirm('是否要删除该采购单')">删除</a>
+                                        </td>
+                                    </tr>
+                                </c:forEach>
+                                </tbody>
+                            </table>               
+                             <jsp:include page="/WEB-INF/view/admin/pageSplit.jsp"></jsp:include>
+                            </form>
+                        </div>
+                        <!-- /.table-responsive -->
+                    </div>
+                    <!-- /.panel-body -->
+                </div>
+                <!-- /.panel -->
+            </div>
+            <!-- /.col-lg-12 -->
+        </div>
+    </div>
+
+    <!-- /.container-fluid -->
+</div>
+
+<jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
+
diff --git a/src/main/webapp/WEB-INF/view/vm/vendor/vendor_add.jsp b/src/main/webapp/WEB-INF/view/vm/vendor/vendor_add.jsp
index 0b5a780..3a1d168 100644
--- a/src/main/webapp/WEB-INF/view/vm/vendor/vendor_add.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/vendor/vendor_add.jsp
@@ -63,6 +63,15 @@
 	                                	<form:input path="email" cssClass="form-control" type="email"/>
 	                                </div>
                                 </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label" for="file">公司证件</label>
+	                                <div class="col-sm-11">
+	                                	<button type="button" class="btn btn-default" 
+                                			onclick="uploader.singleModal({uploadUrl:'/upload.do/image',type:[{image:['all']}],callback:vendorCallback})">
+                                		证件上传</button>
+	                                	<form:hidden path="attachId"/>
+	                                </div>
+                                </div>
                                 <label></label>
                                 <button type="submit"
                                         class="btn btn-primary form-control">添加
@@ -81,3 +90,9 @@
     <!-- /.container-fluid -->
 </div>
 <jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
+
+<script>
+	function vendorCallback(json) {
+		$('#attachId').val(json.id);
+	}
+</script>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/view/vm/vendor/vendor_update.jsp b/src/main/webapp/WEB-INF/view/vm/vendor/vendor_update.jsp
index c35e0f7..e496d78 100644
--- a/src/main/webapp/WEB-INF/view/vm/vendor/vendor_update.jsp
+++ b/src/main/webapp/WEB-INF/view/vm/vendor/vendor_update.jsp
@@ -64,6 +64,15 @@
 	                                	<form:input path="email" cssClass="form-control" type="email"/>
 	                                </div>
                                 </div>
+                                <div class="form-group">
+	                                <label class="col-sm-1 control-label" for="file">公司证件</label>
+	                                <div class="col-sm-11">
+	                                	<button type="button" class="btn btn-default" 
+                                			onclick="uploader.singleModal({uploadUrl:'/upload.do/image',type:[{image:['all']}],callback:vendorCallback,ids:${vendor.attachId}})">
+                                		证件上传</button>
+	                                	<form:hidden path="attachId"/>
+	                                </div>
+                                </div>
                                 <label></label>
                                 <button type="submit"
                                         class="btn btn-primary form-control">修改
@@ -82,3 +91,9 @@
     <!-- /.container-fluid -->
 </div>
 <jsp:include page="/WEB-INF/view/admin/bottom.jsp"></jsp:include>
+
+<script>
+	function vendorCallback(json) {
+		debugger;
+	}
+</script>
diff --git a/src/main/webapp/css/Splitbutton.css b/src/main/webapp/css/Splitbutton.css
deleted file mode 100644
index ac107a6..0000000
--- a/src/main/webapp/css/Splitbutton.css
+++ /dev/null
@@ -1,10 +0,0 @@
-.btn.btn-primary.noselect{
- 	color: #337ab7;
-    background-color: #fff;
-    border-color: #2e6da4;
- } 
-.btn.btn-primary.selected {
- 	color: #fff;
-    background-color: #337ab7;
-    border-color: #2e6da4;
- }  
diff --git a/src/main/webapp/css/style.css b/src/main/webapp/css/style.css
new file mode 100644
index 0000000..39dfd68
--- /dev/null
+++ b/src/main/webapp/css/style.css
@@ -0,0 +1,32 @@
+.btn.btn-primary.noselect{
+ 	color: #337ab7;
+    background-color: #fff;
+    border-color: #2e6da4;
+ } 
+.btn.btn-primary.selected {
+ 	color: #fff;
+    background-color: #337ab7;
+    border-color: #2e6da4;
+ }  
+.breadcrumb {
+  	margin: 5px -10px -20px -10px;
+	background-color: rgb(255, 255, 255);
+ }
+.fileInfo {
+	max-width: 100px;
+	text-overflow: ellipsis;
+    white-space: nowrap;
+    display: inline-block;
+    overflow: hidden;
+}
+.fileDelete {
+	position: absolute;
+    right: 0;
+    top: 7px;
+    color: #c74545;
+    text-shadow: 2px 2px 2px #615f5f;
+    cursor: pointer;
+}
+.attachmentArea {
+	padding : 10px;
+}
\ No newline at end of file
diff --git a/src/main/webapp/js/ajaxfileupload.js b/src/main/webapp/js/ajaxfileupload.js
index 4021e99..2517c2b 100644
--- a/src/main/webapp/js/ajaxfileupload.js
+++ b/src/main/webapp/js/ajaxfileupload.js
@@ -180,7 +180,11 @@ jQuery.extend({
             jQuery.globalEval( data );
         // Get the JavaScript object, if JSON is used.
         if ( type == "json" )
-            eval( "data = " + data );
+        	try {
+        		eval( "data = " + data );
+        	} catch (e) {
+        		data = jQuery.parseJSON(jQuery(data).text());
+        	}
         // evaluate scripts within html
         if ( type == "html" )
             jQuery("<div>").html(data).evalScripts();
diff --git a/src/main/webapp/js/main.js b/src/main/webapp/js/main.js
index 4c93bfd..cedfe59 100644
--- a/src/main/webapp/js/main.js
+++ b/src/main/webapp/js/main.js
@@ -43,35 +43,133 @@ $(document).ready(function () {
     
     //上传控件
     uploader = {
-		uploadUrl : null,
+    	__init__ : false,			//延迟初始化标记
+    	IMPORT_MODAL : 'import',
+    	SINGLE_MODAL : 'single',
+    	MULTI_MODAL : 'multi',
+    	contextPath : $(':hidden[name=contextPath]').remove().val() + '/',
+    	eventDom : null,
+    	param : {
+    		uploadUrl : null,
+    		tempUrl : null,		//模板下载地址
+    		type : null,		//上传文件类型   image word text 
+    							//[{image:['all']},{word:['excel','word']}]
+    		ids : null,			//文件主键  (修改时传入)
+    		callback : null,	//回调fileInfoList数据
+    		
+    		//非前端传入
+    		currentModal : null,	//上传模式	  import/single/multi
+    		onlyImg : false		//仅图片可预览
+    	},
+    	acceptType : {
+    		image:{
+    			all:'',
+    			jpg:'image/jpeg',
+    			jpeg:'image/jpeg',
+    			bmp:'image/bmp',
+    			git:'image/gif',
+    			png:'image/png'
+    		},
+    		word:{
+    			all:'',
+    			excel:'application/vnd.ms-excel	application/x-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+    			word:'application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+    			ppt:'application/vnd.ms-powerpoint,application/vnd.openxmlformats-officedocument.presentationml.presentation'
+    		},
+    		text:{
+    			all:'',
+    			txt:'text/plain',
+    			word:'application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+    		}
+    	},
+    	fileDom : $('#file'),
 		init : function() {
+			var _this = this;
+			this.__init__ = true;
+			//初始化acceptType
+			Object.getOwnPropertyNames(_this.acceptType).forEach(function(t) {
+				var _all = '';
+				Object.getOwnPropertyNames(_this.acceptType[t]).forEach(function(v) {
+					if(v!='all') {
+						_all += _this.acceptType[t][v] + ',';
+					}
+				});
+				if(_all.length) {
+					_this.acceptType[t]['all'] = _all.substring(0,_all.length-1);
+				}
+			});
+			
 			$('#uploadModal').on('hidden.bs.modal', function () {
 		    	$('.modaldownBtn').addClass('hidden')
 			});
+			
+			$('.attachmentArea').on('mouseover mouseout','div[id^=FILE]',function(){
+				$(this).find('.fileDelete').toggleClass('hidden');
+			});
+			
+			$('.attachmentArea').on('click','.fileDelete',function(){
+				var id = $(this).parents('div[id^=FILE]').prop('id');
+				swal({
+				  title: "通知",
+				  text: "是否要删除该附件？",
+				  type: "warning",
+				  showCancelButton: true,
+				  confirmButtonText: "确认",
+				  cancelButtonText: "取消",
+				  closeOnConfirm: true,
+				  closeOnCancel: true
+				},
+				function(isConfirm){
+				  if (isConfirm) {
+					  _this.deleteAttachment(id.split('FILE_')[1]);
+				  }
+				});
+			});
 		    
 			$('#uploadForm').submit(function(){
 				if($('#file').val()=='') {
 					swal('通知','请选择要上传的文件','info');
 					return false;
 				}
-				$('#uploadModal').modal('hide');
+				if(_this.param.currentModal==_this.IMPORT_MODAL) {
+					$('#uploadModal').modal('hide');
+				}
 				$.ajaxFileUpload({
-					url : uploadUrl,
+					url : _this.contextPath + _this.param.uploadUrl,
 					type : "POST",
 					secureuri : false,
 					fileElementId : "file",
 					dataType : "json",
 					success : function(data, status) {
-						console.log("================");
-						console.log(data);
-						$('.uploadFiles').show();
 						if (data && data.resultCode == "0") {
+							_this.param.callback && _this.param.callback(data.data);
+							if(_this.param.currentModal==_this.IMPORT_MODAL) {
+								location.reload();
+							} else if(_this.param.currentModal == this.MULTI_MODAL && this.uploadUrl.indexOf('multiple')!=-1) {
+								data.data.forEach(function(v){
+									if(_this.param.onlyImg) {
+										_this.renderImgFile(v);
+									} else {
+										_this.renderFile(v);
+									}
+								});
+							} else  {
+								if(_this.param.currentModal == _this.SINGLE_MODAL) {
+									$('.attachmentArea').empty();
+									_this.deleteAttachment(_this.param.ids);
+								}
+								if(_this.param.onlyImg) {
+									_this.renderImgFile(data.data);
+								} else {
+									_this.renderFile(data.data);
+								}
+							}
 							swal({
 								title:'通知',
 								text:'上传成功',
 								type:'success',
 							}, function(){
-								if(data.uploadType&&data.uploadType=="procurement"){
+								/*if(data.uploadType&&data.uploadType=="procurement"){
 									var files="<a src='"+data.data.filePath+"'>"+data.data.originalFilename+"</a>" +
 											"<span class='glyphicon glyphicon-remove removeFile'></span>"
 									$('.uploadFiles').html(files);
@@ -86,29 +184,149 @@ $(document).ready(function () {
 								    });
 								}else{
 									location.reload();
-								}
+								}*/
 							});
 						} else {
 							swal('通知','上传失败'+(data.resultMsg?':'+data.resultMsg:''),'error');
 						}
 					},
 					error : function(data, status, e) {
-						swal('通知','上传失败','error');
 						swal('通知','上传失败:服务器异常','error');
 					}
 				});
 				return false;
 			});
 		},
-		uploadModal : function(url,tempUrl){
-	    	uploadUrl = url;
-	    	if(tempUrl!=null && tempUrl!='') {
-	    		$('.modaldownBtn').removeClass('hidden').attr('href',tempUrl);
+		importModal : function(param) {
+			param.currentModal = this.IMPORT_MODAL;
+			this.initModalData(event.target,param);
+		},
+		singleModal : function(param){
+			param.currentModal = this.SINGLE_MODAL;
+			this.initModalData(event.target,param);
+	    },
+	    multiModal : function(param) {
+	    	param.currentModal = this.MULTI_MODAL;
+	    	this.initModalData(event.target,param);
+	    },
+	    initModalData : function(dom,param) {
+	    	if(!this.__init__) this.init();
+	    	var jdom = $(dom);
+	    	if(!jdom.data('data')) {
+	    		this.parseAcceptType(param);
+	    		$.extend(this.param,param);
+	    		jdom.data('data',this.param);
+	    	}
+	    	
+	    	//调整UI
+	    	if(param.currentModal==this.IMPORT_MODAL) {
+	    		$('.modaldownBtn').removeClass('hidden').prop('href', this.contextPath + param.tempUrl);
+	    		$('.attachmentArea').addClass('hidden');
+	    	} else {
+	    		$('.attachmentArea').removeClass('hidden');
+	    		$('.modaldownBtn').addClass('hidden')
 	    	}
 	    	$('#uploadModal').modal('toggle');
+	    	
+	    	//调整上传控件资源
+	    	if(this.param.type!=null) {
+	    		this.fileDom.prop('accept',this.param.type);
+	    	} else {
+	    		this.fileDom.removeProp('accept');
+	    	}
+	    	if(this.param.currentModal == this.MULTI_MODAL && this.uploadUrl.indexOf('multiple')!=-1) {
+	    		this.fileDom.prop('multiple','multiple');
+	    	} else {
+	    		this.fileDom.removeProp('multiple');
+	    	}
+	    	
+	    	//重新加载资源
+	    	if(this.eventDom!=dom) {
+	    		this.eventDom = dom;
+	    		this.reloadAttachment(param.ids);
+	    	}
+	    },
+	    parseAcceptType: function(param) {
+	    	var _this = this;
+	    	var type = param.type;
+	    	if(type==null) return;
+	    	var acceptType = '';
+	    	if(type.length==1 && type[0].image) {
+	    		param.onlyImg = true;
+	    	}
+	    	for(var i in type) {
+	    		var _type = type[i];
+	    		var key = Object.getOwnPropertyNames(_type)[0];
+	    		if(_this.acceptType[key]) {
+	    			type[i][key].forEach(function(v){
+	    				acceptType += _this.acceptType[key][v] + ',';
+	    			});
+	    		}
+	    	}
+	    	if(acceptType.length) acceptType = acceptType.substring(0,acceptType.length-1);
+	    	param.type = acceptType;
+	    },
+	    reloadAttachment : function(ids) {
+	    	var _this = this;
+	    	if($.trim(ids)!='') {
+	    		$.post(this.contextPath + '/upload.do/queryByIds',{ids:ids},function(json){
+	    			if(json.resultCode=='0') {
+	    				json.data.forEach(function(v){
+	    					if(_this.param.onlyImg) {
+	    						_this.renderImgFile(v);
+	    					} else {
+	    						_this.renderFile(v);
+	    					}
+	    				});
+	    			} else {
+	    				swal('通知','上传失败:服务器异常','error');
+	    			}
+	    		});
+	    	}
+	    },
+	    deleteAttachment : function(id) {
+	    	if($.trim(id)!='')
+			$.post(this.contextPath + '/upload.do/delete',{id:id},function(json){
+				if(json.resultCode=='0') {
+					swal("通知", "文件已删除", "success");
+					$('#FILE_'+id).remove();
+				}
+			});
+	    },
+	    renderImgFile : function(data) {
+	    	this.renderInit();
+	    	$('<div>')
+	    	.prop('id',('FILE_'+data.id))
+	    	.addClass('col-md-1')
+	    		.append(this.closeSpan())
+	    		.append(
+	    			$('<img>')
+	    			.prop({'src':data.filePath,'title':data.originalFilename})
+	    			.addClass('img-thumbnail fileInfo'))
+	    	.appendTo($('.attachmentArea .row'));
+	    },
+	    renderFile : function(data) {
+	    	this.renderInit();
+	    	$('<div>')
+	    		.prop('id',('FILE_'+data.id))
+	    		.addClass('col-md-1')
+	    			.append(this.closeSpan())
+	    			.append(
+    				$('<a>')
+				    	.prop({'href':data.filePath,'target':'_blank','title':data.originalFilename})
+				    	.addClass('img-thumbnail fileInfo')
+				    	.text(data.originalFilename))
+			    .appendTo($('.attachmentArea .row'));
+	    },
+	    closeSpan : function() {
+	    	return $('<i class="fa fa-lg fa-times fileDelete hidden">');
+	    },
+	    renderInit : function() {
+	    	if(!$('.attachmentArea .row').length) {
+	    		$('<div>').addClass('row').appendTo($('.attachmentArea'));
+	    	}
 	    }
     };
-    uploader.init();
     
     $("#toggle-advanced-search").click(function(){
         $("i",this).toggleClass("fa-angle-double-down fa-angle-double-up");

From 2948fe38739d69ec6f0c391907055f722d46f818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=8D=8E=E6=88=90?= <duhuacheng.ver@gmail.com>
Date: Fri, 14 Apr 2017 09:51:19 +0800
Subject: [PATCH 14/14] Update README.md

---
 README.md | 81 +------------------------------------------------------
 1 file changed, 1 insertion(+), 80 deletions(-)

diff --git a/README.md b/README.md
index 3fd52aa..1730db6 100644
--- a/README.md
+++ b/README.md
@@ -1,82 +1,3 @@
 # 简介
-这是个简单的教务系统网站,并且结合了图书订购功能,希望这个小DEMO能对大家学习有帮助
-
-# 使用技术 
-
-IoC容器:spring
-
-web框架:springmvc
-
-orm框架:mybatis
-
-安全框架:shiro
-
-数据源:dbcp2
-
-日志: sl4j
-
-Json: Gson
-
-前端框架:Bootstrap
-
-# 修改
-
-# 起步:
-
-1.初始化项目
-
-1)下载Mysql,创建一个数据库名字为giit,导入create.sql与populate.sql,直接运行其中sql即可
-
-2)下载Tomcat
-
-3)使用Intellij Idea导入项目,之后配置项目启动方式,使用刚才下载好的Tomcat
-  
-4)运行
-
-![image](https://pic4.zhimg.com/v2-87231f2eb533cdab3d3e04c7a89457af_b.png)
-
-# 使用简介:
-
-1.权限介绍:
-
-根据导入的populate.sql,运行网站初始时会存在四个权限角色:
-
-1).管理员,账号为admin
-
-2).学生,账号为student
-
-3).教师,账号为teache
-
-4).供应商,账号为supplier
-
-*密码均为123456*
-
-# 功能介绍:
-##  1.基本信息功能:
-其中可以设置一些基本的学校信息,也就是数据库中的实体-关系,之后就可以基于这些基本的关系信息进行更加复杂的功能,例如选课后可以记录多少学生选择了这门课程,只会教师提交图书后计算图书总数可以通过其中的关系得到
-
-1)系部信息
-
-2)专业信息
-
-3)班级信息
-
-4)课程信息
-
-5)学生管理
-
-![image](https://pic1.zhimg.com/v2-44688d7a989ae25d9db6767a50a208f8_b.png)
-
-
-## 2.图书管理功能:
-1)教师上传图书
-
-2)秘书审批图书
-
-3)查看已审核图书
-
-![image](https://pic3.zhimg.com/v2-3ff2f0da17e8609f85da3b61671cf0de_b.png)
-
-# 数据库表结构:
-![image](http://7xi78h.com1.z0.glb.clouddn.com/db.png)
+无