Merge branch 'master' of http://222.66.0.204:8090/panzhaov5/bsth_control

徐烜
2 parents f7875d7c f72f897c
Showing 79 changed files with 2940 additions and 438 deletions
README.md
pom.xml
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/WebAppConfiguration.java
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/controller/DownloadController.java
src/main/java/com/bsth/controller/realcontrol/DeviceRevertLineController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/entity/realcontrol/DeviceRevertLine.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/entity/search/PredicatesBuilder.java
src/main/java/com/bsth/entity/search/SearchOperator.java
src/main/java/com/bsth/repository/SectionRouteRepository.java
src/main/java/com/bsth/repository/realcontrol/DeviceRevertLineRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/security/LoginSuccessHandler.java
src/main/java/com/bsth/security/filter/LoginInterceptor.java
src/main/java/com/bsth/service/impl/SectionServiceImpl.java
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/java/com/bsth/service/impl/StationServiceImpl.java
@@ -278,7 +278,7 @@
 | operCode | short | 一级协议 |
 | data.cityCode | short | 城市区号 |
 | data.deviceId | string | 设备编号 |
-| data.lineId | string | 线路编号 |
+| data.lineId | string | 线路编号 6位 不足6位前面补0 如编号890 用000890表示 |
 ```json
 {
@@ -242,4 +242,8 @@
 			<url>http://repo.spring.io/milestone</url>
 		</pluginRepository>
 	</pluginRepositories>
+	
+	<properties>
+	    <start-class>com.bsth.Application</start-class>
+	</properties>
 </project>
@@ -5,8 +5,9 @@ import com.bsth.security.SecurityMetadataSourceService;
 import com.bsth.service.realcontrol.buffer.GetSchedulePlanThread;
 import com.bsth.service.realcontrol.buffer.SchedulePersistenceThread;
 import com.bsth.vehicle.common.CommonRefreshThread;
-import com.bsth.vehicle.directive.DirectivePersistenceThread;
-import com.bsth.vehicle.directive.FirstScheduleIssuedThread;
+import com.bsth.vehicle.directive.thread.DirectivePersistenceThread;
+import com.bsth.vehicle.directive.thread.FirstScheduleIssuedThread;
+import com.bsth.vehicle.directive.thread.RevertLineThread;
 import com.bsth.vehicle.gpsdata.GpsArrivalStationThread;
 import com.bsth.vehicle.gpsdata.GpsRefreshThread;
 import org.slf4j.Logger;
@@ -32,7 +33,7 @@ public class StartCommand implements CommandLineRunner{
 	@Autowired
 	SecurityMetadataSourceService invocationSecurityMetadataSourceService;
-	public static ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(7);
+	public static ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(8);
 	@Autowired
 	GpsRefreshThread gpsRefreshThread;
@@ -48,6 +49,8 @@ public class StartCommand implements CommandLineRunner{
 	GpsArrivalStationThread gpsArrivalStationThread;
 	@Autowired
 	FirstScheduleIssuedThread firstScheduleIssuedThread;
+	@Autowired
+	RevertLineThread revertLineThread;
 	@Override
 	public void run(String... arg0){
@@ -60,7 +63,7 @@ public class StartCommand implements CommandLineRunner{
 			 * GPS实时数据更新 线程
 			 * 每8秒和网关HTTP接口同步一次
 			 */
-			scheduler.scheduleWithFixedDelay(gpsRefreshThread, 0, 8, TimeUnit.SECONDS);
+			//scheduler.scheduleWithFixedDelay(gpsRefreshThread, 0, 8, TimeUnit.SECONDS);
 			/**
 			 * 每天 0点 抓取当天实际排班
@@ -90,7 +93,7 @@ public class StartCommand implements CommandLineRunner{
 			 * 每15秒从数据库抓取到离站信息和班次匹配
 			 * （网关生成的到离站数据也是延迟批量入库，所以缩短该线程执行周期并不会提高 “实际到离站” 的实时性）
 			 */
-			//scheduler.scheduleWithFixedDelay(gpsArrivalStationThread, 5, 1200, TimeUnit.SECONDS);
+			//scheduler.scheduleWithFixedDelay(gpsArrivalStationThread, 35, 1200, TimeUnit.SECONDS);
 			/**
 			 * 首个调度指令下发（2分钟运行一次）
@@ -98,6 +101,12 @@ public class StartCommand implements CommandLineRunner{
 			 * 后续班次由 “实际终点到达” 事件触发指令下发
 			 */
 			//scheduler.scheduleWithFixedDelay(firstScheduleIssuedThread, 60 , 60 * 2, TimeUnit.SECONDS);
+			
+			/**
+			 * 还车线程（2分钟运行一次）
+			 * 将借出的车刷回原线路
+			 */
+			//scheduler.scheduleWithFixedDelay(revertLineThread, 60 , 60 * 2 , TimeUnit.SECONDS);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -14,6 +14,8 @@ import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
 import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
 import com.bsth.filter.ResourceFilter;
+import com.bsth.websocket.WebSocketHandshakeInterceptor;
+import com.bsth.websocket.handler.RealControlSocketHandler;
 @Configuration
 @EnableWebSocket
@@ -61,6 +63,8 @@ public class WebAppConfiguration extends WebMvcConfigurerAdapter implements WebS
 	@Override
 	public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
-		
+		//线调webSocket
+		registry.addHandler(new RealControlSocketHandler(), "/sockjs/realcontrol").addInterceptors(new WebSocketHandshakeInterceptor())
+        .withSockJS();
 	}
 }
@@ -28,4 +28,6 @@ public class Constants {
 	//车载网关上行接口
 	public static final String UPSTREAM_URL = "/control/upstream";
+	
+	public static final String SESSION_USERNAME = "sessionUserName";
 }
+package com.bsth.controller; 
+
+import java.io.File;  
+import java.io.IOException;  
+  
+import org.apache.commons.io.FileUtils;  
+import org.springframework.context.annotation.Scope;  
+import org.springframework.http.HttpHeaders;  
+import org.springframework.http.HttpStatus;  
+import org.springframework.http.MediaType;  
+import org.springframework.http.ResponseEntity;  
+import org.springframework.stereotype.Component;  
+import org.springframework.web.bind.annotation.RequestMapping;  
+  
+/** 
+ * <一句话功能简述> 
+ * <功能详细描述> 
+ *  
+ * @author  Administrator 
+ * @version  [版本号, 2014年3月7日] 
+ * @see  [相关类/方法] 
+ * @since  [产品/模块版本] 
+ */  
+@Component  
+@Scope("prototype")   
+@RequestMapping("/downloadFile")  
+public class DownloadController  
+{  
+  
+    @RequestMapping("download")    
+    public ResponseEntity<byte[]> download(String jName,String lpName) throws IOException { 
+    	String fileName = jName+lpName+".xls";
+        String path="D:\\export\\target\\"+jName+".xls";  
+        File file=new File(path);  
+        HttpHeaders headers = new HttpHeaders();    
+        String realFileName=new String(fileName.getBytes("UTF-8"),"iso-8859-1");//为了解决中文名称乱码问题  
+        headers.setContentDispositionFormData("attachment", realFileName);   
+        headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);   
+        return new ResponseEntity<byte[]>(FileUtils.readFileToByteArray(file),    
+                                          headers, HttpStatus.CREATED);    
+    }    
+}
+package com.bsth.controller.realcontrol;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.realcontrol.DeviceRevertLine;
+
+@RestController
+@RequestMapping("/deviceRevert")
+public class DeviceRevertLineController extends BaseController<DeviceRevertLine, Integer>{
+
+}
@@ -12,95 +12,218 @@ import org.springframework.web.bind.annotation.RestController;
 import com.bsth.controller.BaseController;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.service.realcontrol.buffer.ScheduleBuffer;
 import com.bsth.vehicle.common.CommonMapped;
+import com.google.common.base.Splitter;
 @RestController
 @RequestMapping("/realSchedule")
-public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, Long>{
+public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, Long> {
 	@Autowired
 	ScheduleRealInfoService scheduleRealInfoService;
-	
+
 	@RequestMapping(value = "/lines")
-	public Map<String, Collection<ScheduleRealInfo>> findByLines(@RequestParam String lines){
+	public Map<String, Collection<ScheduleRealInfo>> findByLines(@RequestParam String lines) {
 		return scheduleRealInfoService.findByLines(lines);
 	}
-	
+
 	/**
 	 * 
-	 * @Title: outgoAdjust 
-	 * @Description: TODO(待发调整) 
-	 * @param @param id 主键
-	 * @param @param remarks 备注
-	 * @param @param dfsj 待发时间（HH:mm）
-	 * @throws
+	 * @Title: registerLine @Description: TODO(注册线路，后续才能收到数据推送) @param @param
+	 * lineCodes @throws
+	 */
+	@RequestMapping(value = "/registerLine", method = RequestMethod.POST)
+	public int registerLine(@RequestParam String lineCodes) {
+		List<String> list = Splitter.on(",").trimResults().omitEmptyStrings().splitToList(lineCodes);
+		String userName = SecurityUtils.getCurrentUser().getUserName();
+		// 注销之前的绑定
+		for (String line : list)
+			CommonMapped.lineUserMap.get(Integer.parseInt(line)).remove(userName);
+		// 重新绑定
+		for (String line : list)
+			CommonMapped.lineUserMap.put(Integer.parseInt(line), userName);
+
+		return 0;
+	}
+
+	/**
+	 * 
+	 * @Title: outgoAdjust @Description: TODO(待发调整) @param @param id
+	 * 主键 @param @param remarks 备注 @param @param dfsj 待发时间（HH:mm） @throws
 	 */
 	@RequestMapping(value = "/outgoAdjust", method = RequestMethod.POST)
-	public Map<String, Object> outgoAdjust(@RequestParam Long id, @RequestParam String remarks,@RequestParam String dfsj){
+	public Map<String, Object> outgoAdjust(@RequestParam Long id, @RequestParam String remarks,
+			@RequestParam String dfsj) {
 		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj);
 	}
-	
+
 	/**
 	 * 
-	 * @Title: destroy 
-	 * @Description: TODO(销毁，烂班) 
-	 * @param @param idsStr  要烂掉的班次ID ,分隔
-	 * @param @param spaceAdjust 自动调整后续间隔（1 是 -1 否）
-	 * @param @param remarks 备注
-	 * @param @param reason 理由
-	 * @param @param spaceNum 间隔（分钟）
-	 * @throws
+	 * @Title: destroy @Description: TODO(销毁，烂班) @param @param idsStr 要烂掉的班次ID
+	 * ,分隔 @param @param spaceAdjust 自动调整后续间隔（1 是 -1 否） @param @param remarks
+	 * 备注 @param @param reason 理由 @param @param spaceNum 间隔（分钟） @throws
 	 */
 	@RequestMapping(value = "/destroy", method = RequestMethod.POST)
-	public Map<String, Object> destroy(@RequestParam String idsStr,@RequestParam int spaceAdjust,@RequestParam String  remarks,@RequestParam String reason,@RequestParam  int spaceNum){
+	public Map<String, Object> destroy(@RequestParam String idsStr, @RequestParam(defaultValue = "-1") int spaceAdjust,
+			@RequestParam String remarks, @RequestParam String reason, @RequestParam(defaultValue = "0") int spaceNum) {
 		return scheduleRealInfoService.destroy(idsStr, spaceAdjust, remarks, reason, spaceNum);
 	}
-	
+
 	/**
 	 * 
-	 * @Title: carDeviceMapp 
-	 * @Description: TODO(获取车辆自编号和设备号对照，从缓存取) 
-	 * @throws
+	 * @Title: carDeviceMapp @Description: TODO(获取车辆自编号和设备号对照，从缓存取) @throws
 	 */
 	@RequestMapping(value = "/carDeviceMapp", method = RequestMethod.GET)
-	public Map<String, String> carDeviceMapp(){
+	public Map<String, String> carDeviceMapp() {
 		return CommonMapped.vehicDeviceBiMap.inverse();
 	}
-	
+
 	/**
 	 * 
-	 * @Title: findPersionByLine 
-	 * @Description: TODO(根据线路主键获取驾驶员) 
-	 * @param @param lineId
-	 * @throws
+	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取驾驶员) @param @param
+	 * lineId @throws
 	 */
 	@RequestMapping(value = "/driver", method = RequestMethod.GET)
-	public List<Map<String, String>> findDriverByLine(@RequestParam String lineCode){
+	public List<Map<String, String>> findDriverByLine(@RequestParam String lineCode) {
 		return scheduleRealInfoService.findDriverByLine(lineCode);
 	}
-	
+
 	/**
 	 * 
-	 * @Title: findPersionByLine 
-	 * @Description: TODO(根据线路主键获取售票员) 
-	 * @param @param lineId
-	 * @throws
+	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取售票员) @param @param
+	 * lineId @throws
 	 */
 	@RequestMapping(value = "/conductor", method = RequestMethod.GET)
-	public List<Map<String, String>> findConductorByLine(@RequestParam String lineCode){
+	public List<Map<String, String>> findConductorByLine(@RequestParam String lineCode) {
 		return scheduleRealInfoService.findConductorByLine(lineCode);
 	}
-	
+
 	/**
 	 * 
-	 * @Title: findPersionByLine 
-	 * @Description: TODO(根据线路主键获取车辆) 
-	 * @param @param lineId
-	 * @throws
+	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取车辆) @param @param
+	 * lineId @throws
 	 */
 	@RequestMapping(value = "/cars", method = RequestMethod.GET)
-	public List<Map<String, String>> findCarByLine(@RequestParam String lineCode){
+	public List<Map<String, String>> findCarByLine(@RequestParam String lineCode) {
 		return scheduleRealInfoService.findCarByLine(lineCode);
 	}
+
+	/**
+	 * 
+	 * @Title: sreachNbbm @Description: TODO(搜索车辆内部编码) @throws
+	 */
+	@RequestMapping(value = "/sreachVehic", method = RequestMethod.GET)
+	public List<Map<String, String>> sreachVehic(@RequestParam String nbbm) {
+		return scheduleRealInfoService.sreachVehic(nbbm);
+	}
+
+	/**
+	 * 
+	 * @Title: adjust @Description: TODO(调整人车) @param @param id
+	 * 班次ID @param @param nbbm 内部编码 @param @param jsy 驾驶员 @param @param spy
+	 * 售票员 @throws
+	 */
+	@RequestMapping(value = "/adjust", method = RequestMethod.POST)
+	public Map<String, Object> adjust(@RequestParam Long id, @RequestParam String nbbm, @RequestParam String jsy,
+			@RequestParam String spy) {
+		return scheduleRealInfoService.adjust(id, nbbm, jsy, spy);
+	}
+
+	/**
+	 * 
+	 * @Title: realOutAdjust 
+	 * @Description: TODO(实发调整) 
+	 * @param @param id 班次ID
+	 * @param @param fcsjActual 实际发车时间 HH:mm
+	 * @param @param remarks 备注
+	 * @throws
+	 */
+	@RequestMapping(value = "/realOutAdjust", method = RequestMethod.POST)
+	public Map<String, Object> realOutAdjust(@RequestParam Long id, @RequestParam String fcsjActual,
+			@RequestParam String remarks) {
+		return scheduleRealInfoService.realOutAdjust(id, fcsjActual, remarks);
+	}
+	
+	/**
+	 * 
+	 * @Title: revokeDestroy 
+	 * @Description: TODO(撤销烂班) 
+	 * @param @param id
+	 * @throws
+	 */
+	@RequestMapping(value = "/revokeDestroy", method = RequestMethod.POST)
+	public Map<String, Object> revokeDestroy(@RequestParam Long id){
+		return scheduleRealInfoService.revokeDestroy(id);
+	}
+	
+	/**
+	 * 
+	 * @Title: revokeRealOutgo 
+	 * @Description: TODO(撤销实发) 
+	 * @param @param id
+	 * @throws
+	 */
+	@RequestMapping(value = "/revokeRealOutgo", method = RequestMethod.POST)
+	public Map<String, Object> revokeRealOutgo(@RequestParam Long id){
+		return scheduleRealInfoService.revokeRealOutgo(id);
+	}
+
+	/**
+	 * 
+	 * @Title: spaceAdjust 
+	 * @Description: TODO(间隔调整) 
+	 * @param @param ids 要调整的班次数组ID
+	 * @param @param space 间隔
+	 * @throws
+	 */
+	@RequestMapping(value = "/spaceAdjust", method = RequestMethod.POST)
+	public Map<String, Object> spaceAdjust(Long[] ids, Integer space){
+		return scheduleRealInfoService.spaceAdjust(ids, space);
+	}
+	
+	/**
+	 * 
+	 * @Title: trustStatus @Description: TODO(线路托管状态) @param @param lineCodes
+	 * 线路编码 @throws
+	 */
+	@RequestMapping(value = "/trustStatus")
+	public Map<Integer, Integer> trustStatus(@RequestParam String lineCodes) {
+		return scheduleRealInfoService.trustStatus(lineCodes);
+	}
+
+	/**
+	 * 
+	 * @Title: changeTrustStatus @Description: TODO(切换线路托管状态) @param @param
+	 * lineCode 线路编码 @param @param status 托管状态 @throws
+	 */
+	@RequestMapping(value = "/trustStatus/change", method = RequestMethod.POST)
+	public int changeTrustStatus(@RequestParam Integer lineCode, @RequestParam Integer status) {
+		ScheduleBuffer.trustMap.put(lineCode, status);
+		return 200;
+	}
+
+	@RequestMapping(value = "/queryUserInfo")
+	public List<ScheduleRealInfo> queryUserInfo(@RequestParam String line, @RequestParam String date) {
+		return scheduleRealInfoService.queryUserInfo(line, date);
+	}
+
+	@RequestMapping(value = "/exportWaybill")
+	public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName, @RequestParam String clZbh,
+			@RequestParam String lpName) {
+		return scheduleRealInfoService.exportWaybill(jName, clZbh, lpName);
+	}
+
+	@RequestMapping(value = "/dailyInfo")
+	public List<Map<String, Object>> dailyInfo(@RequestParam String line, @RequestParam String date) {
+		return scheduleRealInfoService.dailyInfo(line, date);
+	}
+
+	@RequestMapping(value = "/historyMessage")
+	public List<ScheduleRealInfo> historyMessage(@RequestParam String line, @RequestParam String date,
+			@RequestParam String code) {
+		return scheduleRealInfoService.historyMessage(line, date, code);
+	}
 }
+package com.bsth.entity.realcontrol;
+
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 
+ * @ClassName: VehicleRevertLine
+ * @Description: TODO(设备线路还原)
+ * @author PanZhao
+ * @date 2016年7月6日 下午5:31:13
+ *
+ */
+@Entity
+@Table(name = "bsth_v_line_revert")
+public class DeviceRevertLine {
+
+	@Id
+	@GeneratedValue
+	private Integer id;
+
+	/**
+	 * 车辆内部编码
+	 */
+	private String nbbm;
+
+	/**
+	 * 出借时间
+	 */
+	private Long borrowTime;
+
+	private String borrowTimeStr;
+
+	/**
+	 * 出借线路
+	 */
+	private String borrowLine;
+
+	/**
+	 * 归还时间
+	 */
+	private Long revertTime;
+
+	private String revertTimeStr;
+
+	/**
+	 * 归还线路
+	 */
+	private String revertLine;
+	
+	/** 创建日期 */
+	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+	private Date createDate;
+
+	/** 状态 1 已还车 */
+	private Integer status;
+	
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+	public String getBorrowLine() {
+		return borrowLine;
+	}
+
+	public void setBorrowLine(String borrowLine) {
+		this.borrowLine = borrowLine;
+	}
+
+	public String getRevertLine() {
+		return revertLine;
+	}
+
+	public void setRevertLine(String revertLine) {
+		this.revertLine = revertLine;
+	}
+
+	public Long getBorrowTime() {
+		return borrowTime;
+	}
+
+	public void setBorrowTime(Long borrowTime) {
+		this.borrowTime = borrowTime;
+	}
+
+	public String getBorrowTimeStr() {
+		return borrowTimeStr;
+	}
+
+	public void setBorrowTimeStr(String borrowTimeStr) {
+		this.borrowTimeStr = borrowTimeStr;
+	}
+
+	public Long getRevertTime() {
+		return revertTime;
+	}
+
+	public void setRevertTime(Long revertTime) {
+		this.revertTime = revertTime;
+	}
+
+	public String getRevertTimeStr() {
+		return revertTimeStr;
+	}
+
+	public void setRevertTimeStr(String revertTimeStr) {
+		this.revertTimeStr = revertTimeStr;
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+}
@@ -111,6 +111,9 @@ public class ScheduleRealInfo {
 	/**班次状态 0 未执行 1 正在执行 2 已执行 -1 已烂班 */
 	private int status;
+	
+	/** 是否是临加班次 */
+	private boolean sflj;
 	/** 是否误点*/
 	private boolean isLate;
@@ -135,13 +138,19 @@ public class ScheduleRealInfo {
 	private Long dfsjT;
 	/** 指令下发状态  60: 已发送， 100： 设备确认收到， 200：驾驶员确认   0：失败 */
-	private Integer directiveState;
+	private Integer directiveState = -1;
+	
+	/** 起点站计划到达时间 */
+	private String qdzArrDateJH;
+	
+	/** 起点站实际到达时间 */
+	private String qdzArrDateSJ;
 	public void addRemarks(String remark){
 		String newRem = this.getRemarks();
 		if(null == newRem)
 			newRem = "";
-		newRem += remark;
+		newRem += remark + ";";
 		this.setRemarks(newRem);
 	}
@@ -465,10 +474,17 @@ public class ScheduleRealInfo {
 		this.dfsjT = dfsjT;
 	}
+	public void setDfsjAll(Long dfsjT) {
+		this.dfsjT = dfsjT;
+		this.dfsj = sdfHHmm.format(new Date(this.dfsjT));
+	}
+	
 	@Transient
 	static SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
 	@Transient
 	static SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+	@Transient
+	static SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
 	/**
 	 * @throws ParseException 
@@ -503,4 +519,29 @@ public class ScheduleRealInfo {
 	public boolean equals(Object obj) {
 		return this.id.equals(((ScheduleRealInfo)obj).getId());
 	}
+
+	public String getQdzArrDateJH() {
+		return qdzArrDateJH;
+	}
+
+	public void setQdzArrDateJH(String qdzArrDateJH) {
+		this.qdzArrDateJH = qdzArrDateJH;
+	}
+
+	public String getQdzArrDateSJ() {
+		return qdzArrDateSJ;
+	}
+
+	public void setQdzArrDateSJ(String qdzArrDateSJ) {
+		this.qdzArrDateSJ = qdzArrDateSJ;
+	}
+
+	public boolean isSflj() {
+		return sflj;
+	}
+
+	public void setSflj(boolean sflj) {
+		this.sflj = sflj;
+	}
+	
 }
@@ -2,6 +2,9 @@ package com.bsth.entity.search;
 import java.text.NumberFormat;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.Path;
 import javax.persistence.criteria.Predicate;
@@ -107,4 +110,15 @@ public class PredicatesBuilder {
 	public static Predicate ist(CriteriaBuilder cb,Path<Boolean> expression, Object object){
 		return cb.isTrue(expression);
 	}
+	
+	public static Predicate date(CriteriaBuilder cb,Path<?> expression, Object object){
+		Date time = null;
+		try {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			time = sdf.parse(object.toString());
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return cb.equal(expression, time);
+	}
 }
@@ -25,5 +25,6 @@ public enum SearchOperator {
 	isNull, 			// 空
 	isNotNull, 			// 非空
 	isf,				//假 isFalse，boolean
-	ist					//真 isTrue，boolean
+	ist,				//真 isTrue，boolean
+	date				//时间
 }
@@ -141,4 +141,13 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 	 */
 	@Query(value = " select  MAX(r.sectionroute_code) as sectionrouteCode   from bsth_c_sectionroute r  WHERE r.line=?1 and r.directions =?2 and r.sectionroute_code< ?3", nativeQuery=true)
 	List<Object[]> findUpSectionRouteCode(Integer lineId,Integer direction,Integer stationRouteCode);
+	
+	@Query(value =  "SELECT " +
+					"c.directions," +
+					"AsText(s.bsection_vector) as bsection_vector," +
+					"s.speed_limit," +
+					"s.section_name " +
+					" FROM bsth_c_sectionroute c " +
+					" LEFT JOIN bsth_c_section s on c.section = s.id where c.line = ?1 and c.directions = ?2", nativeQuery=true)
+List<Object[]> sectionRouteVector(Integer lineId,Integer directions);
 }
+package com.bsth.repository.realcontrol;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import com.bsth.entity.realcontrol.DeviceRevertLine;
+import com.bsth.repository.BaseRepository;
+
+@Repository
+public interface DeviceRevertLineRepository extends BaseRepository<DeviceRevertLine, Integer>{
+
+	@Query(value = "select dr from DeviceRevertLine dr where dr.revertTime > ?1 and dr.revertTime < ?2 and dr.status = ?3")
+	public List<DeviceRevertLine> findByDateAndStatus(Long st, Long et, Integer status);
+}
 package com.bsth.repository.realcontrol;
 import java.util.List;
+import java.util.Map;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -21,4 +22,16 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@EntityGraph(value = "scheduleRealInfo_childTasks", type = EntityGraph.EntityGraphType.FETCH)
     @Override
     Page<ScheduleRealInfo> findAll(Specification<ScheduleRealInfo> spec, Pageable pageable);
+	
+	@Query(value="select s from ScheduleRealInfo s where s.xlName = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 group by jName,clZbh,lpName")
+	List<ScheduleRealInfo> queryUserInfo(String line,String date);
+	
+	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3")
+	List<ScheduleRealInfo> exportWaybill(String jName,String clZbh,String lpName);
+	
+	@Query(value="select new map(clZbh,jGh,jName,sum(jhlc)) from ScheduleRealInfo s where s.xlName = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 group by clZbh,jGh")
+	List<Map<String, Object>> dailyInfo(String line,String date);
+	
+	@Query(value="select s from ScheduleRealInfo s where s.xlName = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.clZbh like ?3")
+	List<ScheduleRealInfo> historyMessage(String line,String date,String code);
 }
@@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
+import com.bsth.common.Constants;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.util.IpUtils;
@@ -22,6 +23,8 @@ public class LoginSuccessHandler extends SavedRequestAwareAuthenticationSuccessH
 		System.out.println("管理员 " + user.getUserName() + " 登录");
 		System.out.println("IP :"+IpUtils.getIpAddr(request));
+		//session里写入用户名
+		request.getSession().setAttribute(Constants.SESSION_USERNAME, user.getUserName());
 		super.onAuthenticationSuccess(request, response, authentication);  
     }
@@ -18,6 +18,7 @@ import org.springframework.security.access.intercept.AbstractSecurityInterceptor
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import com.alibaba.fastjson.JSON;
 import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
 import com.bsth.util.RequestUtils;
@@ -52,7 +53,7 @@ public class LoginInterceptor extends AbstractSecurityInterceptor implements Fil
 				Map<String, Object> map = new HashMap<>();
 				map.put("status",
 						ResponseCode.NO_AUTHENTICATION);
-				response.getWriter().print(map);
+				response.getWriter().print(JSON.toJSONString(map));
 			}
 			else
 				response.sendRedirect(Constants.LOGIN_PAGE);
@@ -9,7 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
 import com.bsth.entity.Section;
@@ -122,7 +121,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 			Integer directions = map.get("directions").equals("") ? null : Integer.parseInt(map.get("directions").toString());
 			// 线路ID
-			Integer sectionRouteLine =map.get("sectionRouteLine").equals("") ? null : Integer.parseInt(map.get("sectionRouteLine").toString());
+			Integer sectionRouteLine = map.get("sectionRouteLine").equals("") ? null : Integer.parseInt(map.get("sectionRouteLine").toString());
 			// 道路编码
 			String roadCoding = map.get("roadCoding").equals("") ? "" : map.get("roadCoding").toString();
@@ -403,16 +402,18 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 			// 路段路由
 			SectionRoute sectionRoute = new SectionRoute();
-			String sectionrouteCodeArray[] = null;
-			
 			Integer routeCode = null;
 			if(!sectionrouteCode.equals("")){
-				sectionrouteCodeArray = sectionrouteCode.split("_");
+				String sectionrouteCodeArray[] =  sectionrouteCode.split("_");
 				routeCode = Integer.valueOf(sectionrouteCodeArray[0])+1;
+			}else {
+				
+				routeCode = 100;
+				
 			}	
 			sectionRoute.setSectionrouteCode(routeCode);
 package com.bsth.service.impl;
+import java.awt.Point;
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -20,6 +23,8 @@ import com.bsth.repository.StationRepository;
 import com.bsth.repository.StationRouteRepository;
 import com.bsth.service.StationRouteService;
 import com.bsth.util.FTPClientUtils;
+import com.bsth.util.Test;
+import com.bsth.util.db.DBUtils_MS;
 /**
  * 
@@ -512,106 +517,316 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			// 获取线路ID
 			Integer lineId = map.get("lineId").equals("") ? 0 : Integer.parseInt(map.get("lineId").toString());
+			/** 查询线路信息 */
 			Line line = lineRepository.findOne(lineId);
 			List<Object[]> objects = repository.usingSingle(lineId);
-			String stationRStr = "";
+			if (objects.size()>0) {
+				
+				/** 获取配置文件里的ftp参数 */
+				Map<String, Object> FTPParamMap = readPropertiesGetFTPParam();
+				
+				// 压缩文件名
+				String odlGzFileName = line.getLineCode() + ".txt.gz";
+				
+				// text文件名
+				String textFileName  = line.getLineCode() + ".txt";
+				
+				FTPClientUtils clientUtils = new FTPClientUtils();
+				
+				String url = FTPParamMap.get("url").toString();
+				
+				int port = Integer.valueOf(FTPParamMap.get("port").toString());
+				
+				String username = FTPParamMap.get("username").toString();
+				
+				String password = FTPParamMap.get("password").toString();
+				
+				String remotePath = FTPParamMap.get("remotePath").toString();
+				
+				/** 如果行单文件已存在则删除 */
+				clientUtils.deleteFtpFile(url, port, username, password, remotePath, odlGzFileName);
+				
+				clientUtils.deleteFtpFile(url, port, username, password, remotePath, textFileName);
+				
+				String textStr = newTextFileToFTP(objects,lineId);
+				
+				/*textStr = line.getName() + "\t" + "2" + "\r\n" + textStr;*/
+				
+				textStr = line.getName() + "\t" + "2" + "\r" + textStr;
+				
+				InputStream input = new ByteArrayInputStream(textStr.getBytes("gbk"));
+				
+				/** 生成text文件 */
+				clientUtils.uploadFile(url, port, username, password, remotePath, textFileName, input);
+				
+				Test test= new Test();
+				
+				File textFile = clientUtils.GetFtpFile(url, port, username, password, remotePath, textFileName);
+				
+				File[] sources = new File[] {textFile};
+				
+				File target = new File(odlGzFileName);
+				  
+				File targetFile = test.pack(sources, target);
+				
+				/*clientUtils.testUpLoadFromDisk(targetFile,targetFile.getName());*/
+				
+				clientUtils.testUpLoadFromDisk(targetFile, targetFile.getName(), url, port, username, password, remotePath);
+				
+				resultMap.put("status", ResponseCode.SUCCESS);
+				
+			}else {
+				
+				resultMap.put("status","NOTDATA");
+			}
+			
+			
+		} catch (Exception e) {
+
+			resultMap.put("status", ResponseCode.ERROR);
-			// windows下的文本文件换行符
-			// String enterStr = "\r\n";
+			logger.error("save erro.", e);
-			// linux/unix下的文本文件换行符
-			String enterStr = "\r";
+		}  
+		return resultMap;
+	}
+	
+	public String  newTextFileToFTP(List<Object[]> objects,Integer lineId) {
+		
+		String stationRStr = "";
+		
+		// windows下的文本文件换行符
+		// String enterStr = "\r\n";
+		
+		// linux/unix下的文本文件换行符
+		String enterStr = "\r";
+		
+		if(objects.size()>0) {
-			if(objects.size()>0) {
+			for(int i = 0; i<objects.size();i++) {
+				
+				// 经度
+				String lng = objects.get(i)[0].equals("") ? "" : objects.get(i)[0].toString();
+				
+				// 纬度
+				String lat = objects.get(i)[1].equals("") ? "" : objects.get(i)[1].toString();
-				for(int i = 0; i<objects.size();i++) {
+				lat = "\t" +  lat;
+				
+				// 站点类型
+				String stationMake =  objects.get(i)[3].equals("") ? "" : objects.get(i)[3].toString();
+				
+				if(stationMake.equals("E")) {
-					// 经度
-					String lng = objects.get(i)[0].toString();
+					stationMake = "\t" + "2";
-					// 纬度
-					String lat = " " + objects.get(i)[1].toString();
+				}else {
-					// 站点类型
-					String stationMake =  objects.get(i)[3].toString();
+					stationMake ="\t" + "1";
-					if(stationMake.equals("E")) {
+				}
+				
+				// 站点序号 
+				String stationNo =  objects.get(i)[4].equals("") ? "" : objects.get(i)[4].toString();
+				
+				stationNo = "\t" + stationNo;
+				
+				// 站点编码
+				String stationCode = objects.get(i)[5].equals("") ? "" : objects.get(i)[5].toString();
+				
+				stationCode =  "\t" +stationCode;
+				
+				double dis = objects.get(i)[6]==null  ? 0.0 : Double.parseDouble(objects.get(i)[6].toString());
+				
+				double tempd = dis*1000;
+				
+				// 站点距离
+				String staitondistance = "\t" + String.valueOf((int) tempd);
+				
+				// 站点名称
+				String stationName =  objects.get(i)[7].equals("") ? "" : objects.get(i)[7].toString();
+				
+				// 限速
+				// String sleepStr = " " + "60";
+				
+				String sleepStr = "";
+				
+				int directions = objects.get(i)[8]==null ? null : Integer.valueOf(objects.get(i)[8].toString());
+				
+				List<Object[]> sobje = routeRepository.sectionRouteVector(lineId,directions);
+				
+				if(sobje.size()==1) {
+					
+					sleepStr = sobje.get(0)[2] == null ? "" : sobje.get(0)[2].toString();
+					
+					sleepStr =  "\t" + sleepStr;
+					
+				}else if(sobje.size()>1){
+					
+					/** 这里暂时只根据站点名称去匹配所在路段的限速值 ，如果路段名称"至"之前的地名与站点名称等同，就认为站点在路段上。 */
+					for(int j =0;j<sobje.size();j++) {
-						stationMake = " " + "2";
+						String sectionName = sobje.get(j)[3].toString();
-					}else {
+						String sectionNameA[] = sectionName.split("至");
-						stationMake =" " + "1";
+						if(stationName.equals(sectionNameA[0])){
+							
+							sleepStr = sobje.get(j)[2].toString();
+							
+							sleepStr =  "\t" + sleepStr;
+							
+						}
 					}
-					// 站点序号 
-					String stationNo = " " + objects.get(i)[4].toString();
-					
-					// 站点编码
-					String stationCode = " " + objects.get(i)[5].toString();
+					/*
+					String bdJWPointStr = objects.get(i)[2].toString();
-					double tempd = Double.parseDouble(objects.get(i)[6].toString())*1000;
+					String bdJWPointA[] = bdJWPointStr.split(" ");
-					// 站点距离
-					String staitondistance = " " + String.valueOf((int) tempd);
+					Map<String, Object> pointsM = new HashMap<String,Object>();
-					// 限速
-					String sleepStr = " " + "60";
+					pointsM.put("lng", bdJWPointA[0]);
-					// 站点名称
-					String staitonName = " " + objects.get(i)[7].toString();
+					pointsM.put("lat", bdJWPointA[1]);
-					stationRStr = stationRStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + staitonName + enterStr;
+					System.out.println(objects.get(i)[7].toString());
+					sleepStr = sleepStr + GetFormPointOnPolylineSeleepLimit(pointsM,sobje);*/
 				}
+				if(sleepStr.equals(""))
+					sleepStr = "\t" + "60";
+					
+				
+				stationName = "\t" +stationName;
+				
+				stationRStr = stationRStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + stationName + enterStr;
+				
 			}
-			System.out.println(stationRStr);
-			
-			FTPClientUtils  ftpClientUtils = new FTPClientUtils();
+		}
+		
+		return stationRStr;
+		
+	}
+	
+	public String GetFormPointOnPolylineSeleepLimit(Map<String, Object> p,List<Object[]> listObjArra) {
+		
+		String sleeplimiV = "";
+		
+		int size = listObjArra.size();
+		
+		if(size>0) {
-			// ip
-			String url = "222.66.0.205";
+			for(int i =0;i<size-1;i++) {
+				
+				System.out.println(listObjArra.get(i)[3].toString());
+				
+				
+				List<Map<String, Object>> listM = new ArrayList<Map<String,Object>>();
+				
+				String bVecotr = listObjArra.get(i)[1].toString();
+				
+				bVecotr = bVecotr.substring(11,bVecotr.length()-1);
+				
+				String tempA [] = bVecotr.split(",");
+				
+				int len = tempA.length;
+				
+				for(int e = 0; e< len ;e++) {
+					
+					Map<String, Object> tempM = new HashMap<String,Object>();
+					
+					String temStr = tempA[e];
+					
+					String nextTemA[] = temStr.split(" ");
+					
+					tempM.put("lng", nextTemA[0]);
+					
+					tempM.put("lat", nextTemA[1]);
+					
+					listM.add(tempM);
+					
+				}
+				
+				if(isPointOnPolyline(p,listM)) {
+					
+					
+					sleeplimiV = listObjArra.get(i)[2].toString();
+				}
+				
+			}
+				
+		}
+		
+		
+		return sleeplimiV;
+	}
+	
+	public boolean isPointOnPolyline (Map<String, Object> point, List<Map<String, Object>> listMap ){
+		
+		boolean success = false;
+		
+		for(int l = 0; l < listMap.size() - 1; l	++){
-			// ftp端口
-			int  port = 21;
+			Map<String, Object> tempM = listMap.get(l);
-			// 用户名
-			String username = "transport";
+			Map<String, Object> nextTempM = listMap.get(l+1);
-			// 密码
-			String password = "transport123";
+			 if (Double.valueOf(point.get("lng").toString())>= Math.min(Double.valueOf(tempM.get("lng").toString()), Double.valueOf(nextTempM.get("lng").toString())) && Double.valueOf(point.get("lng").toString()) <= Math.max(Double.valueOf(tempM.get("lng").toString()), Double.valueOf(nextTempM.get("lng").toString())) &&
+					 Double.valueOf(point.get("lat").toString()) >= Math.min(Double.valueOf(tempM.get("lat").toString()), Double.valueOf(nextTempM.get("lat").toString())) &&  Double.valueOf(point.get("lat").toString()) <= Math.max(Double.valueOf(tempM.get("lat").toString()), Double.valueOf(nextTempM.get("lat").toString()))){
+				 
+				 
+				 double precision = (Double.valueOf(tempM.get("lng").toString()) - Double.valueOf(point.get("lng").toString())) * (Double.valueOf(nextTempM.get("lat").toString()) - Double.valueOf(point.get("lat").toString())) - 
+		                    (Double.valueOf(nextTempM.get("lng").toString()) - Double.valueOf(tempM.get("lng").toString())) * (Double.valueOf(tempM.get("lat").toString()) - Double.valueOf(nextTempM.get("lat").toString()));
+				 
+				 if(precision < 2e-10 && precision > -2e-10){
+					 
+					//实质判断是否接近0
+					 success = true;
+	                
+				 }  
+				 
+			 }
-			// 路径
-			String path = "down/";
+		}
+		
+		return success;
+	}
+	
+	public Map<String, Object> readPropertiesGetFTPParam(){
+		
+		Map<String, Object> resultMap = new HashMap<String, Object>();
+		
+		Properties env = new Properties();
+		
+		try {
-			// 文件名
-			String filename = line.getLineCode() + ".txt";
+			env.load(DBUtils_MS.class.getClassLoader().getResourceAsStream("ftp.properties"));
-			String versions = "2";
+			resultMap.put("url", env.getProperty("ftp.url"));
-			stationRStr  =  line.getName() + " " +versions + enterStr + stationRStr;
+			resultMap.put("port", env.getProperty("ftp.port"));
-			InputStream input = new ByteArrayInputStream(stationRStr.getBytes("utf-8"));
+			resultMap.put("username", env.getProperty("ftp.username"));
-			boolean b = ftpClientUtils.uploadFile(url, port, username, password, path, filename, input);
+			resultMap.put("password", env.getProperty("ftp.password"));
-			resultMap.put("status", ResponseCode.SUCCESS);
+			resultMap.put("remotePath", env.getProperty("ftp.path"));
 		} catch (Exception e) {
-			resultMap.put("status", ResponseCode.ERROR);
+			e.printStackTrace();
-			logger.error("save erro.", e);
-			
-		}  
-		return resultMap;
+		}
+		
+		return resultMap ;
 	}
-
+	
 	@Override
 	public List<Map<String, Object>> findStationRouteInfo(Map<String, Object> map) {
@@ -866,25 +866,32 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			Line resultLine = lineRepository.findOne(line);
 			// 站点路由序号
-			String stationRouteCode = map.get("stationRouteCode").equals("") ? "" : map.get("stationRouteCode").toString();
+			String stationRouteCodeStr = map.get("stationRouteCode").equals("") ? "" : map.get("stationRouteCode").toString();
 			// 站点类型
 			String stationMark = map.get("stationMark").equals("") ? "" : map.get("stationMark").toString();
-			String stationRouteCodeArray [] = null;
+			Integer stationRouteCode = null;
-			if(stationRouteCode!="") {
+			if(stationRouteCodeStr!="") {
+				
+				String stationRouteCodeArray [] = stationRouteCodeStr.split("_");
-				stationRouteCodeArray= stationRouteCode.split("_");
+				stationRouteCode = Integer.parseInt(stationRouteCodeArray[0]+1);
+				
+				
+			}else {
+				
+				stationRouteCode = 100;
 			}
 			// 保存站点
-			/*repository.stationSave(stationCod, stationName, roadCoding, dbType, bJwpoints, 
+			repository.stationSave(stationCod, stationName, roadCoding, dbType, bJwpoints, 
 									gLonx, gLaty, x, y, gPloygonGrid,bPloygonGrid, destroy, radius, 
-									
-									shapesType, versions, descriptions, createBy, updateBy,stationId);*/
+								
+									shapesType, versions, descriptions, createBy, updateBy,stationId);
@@ -908,7 +915,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			arg0.setStationCode(stationCod);
 			// 站点路由序号
-			arg0.setStationRouteCode(Integer.parseInt(stationRouteCodeArray[0])+1);
+			arg0.setStationRouteCode(stationRouteCode);
 			// 站点路由类型
 			arg0.setStationMark(stationMark);
@@ -931,7 +938,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			// 站点路由说明
 			arg0.setDescriptions(descriptions);
-			/*routeRepository.save(arg0);*/
+			routeRepository.save(arg0);
 			resultMap.put("status", ResponseCode.SUCCESS);
+package com.bsth.service.realcontrol;
+
+import com.bsth.entity.realcontrol.DeviceRevertLine;
+import com.bsth.service.BaseService;
+
+public interface DeviceRevertLineService extends BaseService<DeviceRevertLine, Integer>{
+
+}
@@ -24,4 +24,56 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<Map<String, String>> findCarByLine(String lineCode);
+	List<Map<String, String>> sreachVehic(String nbbm);
+
+	Map<String, Object> adjust(Long id, String nbbm, String jsy, String spy);
+	
+	/**
+	 * 
+	 * @Title: adjustCar 
+	 * @Description: TODO(班次调整车辆) 
+	 * @param @param schedule 班次
+	 * @param @param car 车辆自编号
+	 * @throws
+	 */
+	void adjustCar(ScheduleRealInfo schedule, String car);
+	
+	/**
+	 * 
+	 * @Title: adjustDriver 
+	 * @Description: TODO(班次调整驾驶员) 
+	 * @param @param schedule 班次
+	 * @param @param driver 驾驶员工号
+	 * @throws
+	 */
+	void adjustDriver(ScheduleRealInfo schedule, String driver, String driverName);
+	
+	/**
+	 * 
+	 * @Title: adjustConductor 
+	 * @Description: TODO(班次调整售票员) 
+	 * @param @param schedule 班次
+	 * @param @param conductor 售票员工号
+	 * @throws
+	 */
+	void adjustConductor(ScheduleRealInfo schedule, String conductor, String conductorName);
+	
+	List<ScheduleRealInfo> queryUserInfo(String line,String date);
+	
+	List<ScheduleRealInfo> exportWaybill(String jName,String clZbh,String lpName);
+	
+	List<Map<String,Object>> dailyInfo(String line,String date);
+	
+	List<ScheduleRealInfo> historyMessage(String line,String date,String code);
+
+	Map<Integer, Integer> trustStatus(String lineCodes);
+
+	Map<String, Object> realOutAdjust(Long id, String fcsjActual, String remarks);
+
+	Map<String, Object> revokeDestroy(Long id);
+
+	Map<String, Object> revokeRealOutgo(Long id);
+
+	Map<String, Object> spaceAdjust(Long[] ids, Integer space);
+
 }
@@ -6,6 +6,7 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -54,6 +55,12 @@ public class ScheduleBuffer {
 	 */
 	public static LinkedList<ScheduleRealInfo> persistentList;
+	/**
+	 * 线路是否托管 
+	 * K：线路编码  V：0 托管  1 非托管
+	 */
+	public static Map<Integer, Integer> trustMap; 
+	
 	static ScheduleComparator scheduleComparator = new ScheduleComparator();
 	static{
@@ -63,6 +70,8 @@ public class ScheduleBuffer {
 		vehLinkedMap = new HashMap<>();
 		finishLinkedMap = LinkedListMultimap.create();
+		
+		trustMap = new HashMap<>();
 	}
 	public static int init(List<ScheduleRealInfo> list){
@@ -83,6 +92,11 @@ public class ScheduleBuffer {
 				vehLinkedMap.get(zbh).add(schedul);
 			}
+			
+			//计算起点应到时间
+			Set<String> codes = schedulListMap.keySet();
+			for(String code : codes)
+				calcArrDateQd(code);
 		}catch(Exception e){
 			logger.error("缓存排班数据失败...", e);
 			return -1;
@@ -117,7 +131,7 @@ public class ScheduleBuffer {
 	 * @Title: finishSch 
 	 * @Description: TODO(完成一个班次) 
 	 * @param @param sch
-	 * @return ScheduleRealInfo  返回 下一个待执行的班次
+	 * @return ScheduleRealInfo  返回 下一个未执行的班次
 	 * @throws
 	 */
 	public static ScheduleRealInfo finishSch(ScheduleRealInfo sch){
@@ -136,8 +150,9 @@ public class ScheduleBuffer {
 				break;
 			}
 		}
-		
-		return list.getFirst();
+		ScheduleRealInfo next = list.getFirst();
+		next.setQdzArrDateSJ(sch.getZdsjActual());
+		return next;
 	}
 	/**
@@ -150,4 +165,46 @@ public class ScheduleBuffer {
 	public static int getFinishSchNo(String nbbm){
 		return finishLinkedMap.get(nbbm) == null ? 0 : finishLinkedMap.get(nbbm).size();
 	}
+	
+	/**
+	 * 
+	 * @Title: calcArrDateQd 
+	 * @Description: TODO(计算计划起点时间) 
+	 * @throws
+	 */
+	public static void calcArrDateQd(String lineCode){
+		List<ScheduleRealInfo> list = schedulListMap.get(lineCode);
+		//按车辆分组
+		ArrayListMultimap<String, ScheduleRealInfo> map = ArrayListMultimap.create();
+		for(ScheduleRealInfo sch : list){
+			map.put(sch.getClZbh(), sch);
+		}
+		
+		//链接班次
+		Set<String> set = map.keySet();
+		List<ScheduleRealInfo> subList;
+		int len;
+		ScheduleRealInfo prve, curr;
+		for(String k : set){
+			subList = map.get(k);
+			//排序
+			Collections.sort(subList, scheduleComparator);
+			len = subList.size();
+			if(len == 0)
+				continue;
+			
+			prve = subList.get(0);
+			for(int i = 1; i < len; i ++){
+				curr = subList.get(i);
+				if(prve.getZdzName().equals(curr.getQdzName()))
+					curr.setQdzArrDateJH(prve.getZdsj());
+				
+				prve = curr;
+			}
+		}
+	}
+	
+	public static ScheduleRealInfo findOne(Long id){
+		return pkSchedulMap.get(id);
+	}
 }
+package com.bsth.service.realcontrol.impl;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import com.bsth.entity.realcontrol.DeviceRevertLine;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.realcontrol.DeviceRevertLineService;
+
+@Service
+public class DeviceRevertLineServiceImpl extends BaseServiceImpl<DeviceRevertLine, Integer> implements DeviceRevertLineService  {
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+	
+	SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm")
+					,sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd")
+					,sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+	
+	@Override
+	public Map<String, Object> save(DeviceRevertLine t) {
+		
+		String dateStr = sdfyyyyMMdd.format(new Date());
+		
+		try {
+			t.setStatus(0);
+			t.setBorrowTime(sdfyyyyMMddHHmm.parse(dateStr + " " + t.getBorrowTimeStr()).getTime());
+			t.setRevertTime(sdfyyyyMMddHHmm.parse(dateStr + " " + t.getRevertTimeStr()).getTime());
+		} catch (ParseException e) {
+			logger.error("", e);
+		}
+		return super.save(t);
+	}
+}
 package com.bsth.service.realcontrol.impl;
+import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
-import javax.transaction.Transactional;
-
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +20,7 @@ import org.springframework.stereotype.Service;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Cars;
+import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.CarConfigInfo;
@@ -29,36 +33,38 @@ import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
 import com.bsth.service.realcontrol.buffer.ScheduleBuffer;
+import com.bsth.util.ReportUtils;
+import com.bsth.vehicle.common.CommonMapped;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 @Service
-public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInfo, Long> implements ScheduleRealInfoService{
+public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInfo, Long>
+		implements ScheduleRealInfoService {
 	@Autowired
 	ScheduleRealInfoRepository scheduleRealInfoRepository;
-	
+
 	@Autowired
 	EmployeeConfigInfoRepository employeeConfigInfoRepository;
-	
+
 	@Autowired
 	CarConfigInfoRepository carConfigInfoRepository;
-	
+
 	Logger logger = LoggerFactory.getLogger(this.getClass());
-	
-	SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd")
-			, sdfMinute = new SimpleDateFormat("yyyy-MM-dd HH:mm")
-			, sdfShort = new SimpleDateFormat("HH:mm");
-	
+
+	SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+			sdfMinute = new SimpleDateFormat("yyyy-MM-dd HH:mm"), sdfShort = new SimpleDateFormat("HH:mm");
+
 	@Override
 	public Map<String, Collection<ScheduleRealInfo>> findByLines(String lines) {
 		List<String> lineList = Lists.newArrayList(Splitter.on(',').trimResults().omitEmptyStrings().split(lines));
-		
+
 		Multimap<String, ScheduleRealInfo> mMap = ArrayListMultimap.create();
-		
-		for(String lineCode : lineList){
+
+		for (String lineCode : lineList) {
 			mMap.putAll(lineCode, ScheduleBuffer.schedulListMap.get(lineCode));
 		}
 		return mMap.asMap();
@@ -67,19 +73,19 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj) {
 		Map<String, Object> map = new HashMap<>();
-		try{
-			
+		try {
+
 			ScheduleRealInfo schedule = ScheduleBuffer.pkSchedulMap.get(id);
 			schedule.setDfsjT(sdfMinute.parse(sdfMonth.format(new Date()) + " " + dfsj).getTime());
 			schedule.setDfsj(dfsj);
-			schedule.addRemarks("[待发调整] " + remarks +";");
-			//持久化到数据库
+			schedule.addRemarks(remarks + ";");
+			// 持久化到数据库
 			ScheduleBuffer.persistentList.add(schedule);
-			
+
 			map.put("status", ResponseCode.SUCCESS);
 			map.put("dfsj", dfsj);
 			map.put("remarks", schedule.getRemarks());
-		}catch(Exception e){
+		} catch (Exception e) {
 			logger.error("", e);
 			map.put("status", ResponseCode.ERROR);
 		}
@@ -87,88 +93,88 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	}
 	@Override
-	public Map<String, Object> destroy(String idsStr, int spaceAdjust, String  remarks, String reason, int spaceNum) {
-		
+	public Map<String, Object> destroy(String idsStr, int spaceAdjust, String remarks, String reason, int spaceNum) {
+
 		Map<String, Object> map = new HashMap<>();
 		List<ScheduleRealInfo> rsList = new ArrayList<>();
 		map.put("list", rsList);
-		try{
+		try {
 			List<String> idList = Lists.newArrayList(Splitter.on(',').trimResults().omitEmptyStrings().split(idsStr));
-			
+
 			ScheduleRealInfo schedule = null;
-			for(String id : idList){
+			for (String id : idList) {
 				schedule = ScheduleBuffer.pkSchedulMap.get(Long.parseLong(id));
-				if(null != schedule){
+				if (null != schedule) {
 					schedule.setStatus(-1);
-					schedule.setRemarks("计划烂班["+reason+"] " + remarks);
-					
+					schedule.addRemarks(remarks);
+
 					rsList.add(schedule);
 				}
 			}
-			
-			//调整间隔
-			if(spaceAdjust == 1){
-				
+
+			// 调整间隔
+			if (spaceAdjust == 1) {
+
 				ScheduleRealInfo first = ScheduleBuffer.pkSchedulMap.get(Long.parseLong(idList.get(0)));
 				String lineCode = first.getXlBm();
 				String upDown = first.getXlDir();
-				
-				List<ScheduleRealInfo> schList = ScheduleBuffer.schedulListMap.get(lineCode)
-							,dirList = new ArrayList<>();
-				//筛选走向
-				for(ScheduleRealInfo s : schList){
-					if(s.getXlDir().equals(upDown)){
+
+				List<ScheduleRealInfo> schList = ScheduleBuffer.schedulListMap.get(lineCode),
+						dirList = new ArrayList<>();
+				// 筛选走向
+				for (ScheduleRealInfo s : schList) {
+					if (s.getXlDir().equals(upDown)) {
 						dirList.add(s);
 					}
 				}
-				
+
 				int size = dirList.size();
 				Long st = null;
 				int diff = spaceNum * 60 * 1000;
-				for(int i = 0; i < size; i ++){
+				for (int i = 0; i < size; i++) {
 					schedule = dirList.get(i);
-					
-					if(schedule.getId() == first.getId()){
-						if(i == 0)
+
+					if (schedule.getId() == first.getId()) {
+						if (i == 0)
 							st = schedule.getDfsjT() - diff;
 						else
 							st = dirList.get(i - 1).getDfsjT();
 						continue;
 					}
-					if(null == st || schedule.getStatus() == -1)
+					if (null == st || schedule.getStatus() == -1)
 						continue;
-					
+
 					st = st + diff;
 					schedule.setDfsjT(st);
 					schedule.setDfsj(sdfShort.format(new Date(st)));
-					
+
 					ScheduleBuffer.persistentList.add(schedule);
-					//将调整的班次返回给页面
+					// 将调整的班次返回给页面
 					rsList.add(schedule);
 				}
 			}
-			
+
 			map.put("status", ResponseCode.SUCCESS);
-		}catch(Exception e){
+		} catch (Exception e) {
 			logger.error("", e);
 			map.put("status", ResponseCode.ERROR);
 		}
 		return map;
 	}
-	//线路id获取驾驶员
+	// 线路id获取驾驶员
 	@Override
 	public List<Map<String, String>> findDriverByLine(String lineCode) {
 		List<EmployeeConfigInfo> list = employeeConfigInfoRepository.findBylineCode(lineCode);
-		
+
 		List<Map<String, String>> rsList = new ArrayList<>();
 		Map<String, String> map = null;
 		Personnel driver = null;
 		String code = null;
-		
-		for(EmployeeConfigInfo employee : list){
+
+		for (EmployeeConfigInfo employee : list) {
 			driver = employee.getJsy();
-			if(driver != null){
+			if (driver != null) {
 				map = new HashMap<>();
 				code = driver.getJobCode();
 				map.put("id", code + "/" + driver.getPersonnelName());
@@ -179,19 +185,19 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		return rsList;
 	}
-	//线路id获取售票员
+	// 线路id获取售票员
 	@Override
 	public List<Map<String, String>> findConductorByLine(String lineCode) {
 		List<EmployeeConfigInfo> list = employeeConfigInfoRepository.findBylineCode(lineCode);
-		
+
 		List<Map<String, String>> rsList = new ArrayList<>();
 		Map<String, String> map = null;
 		Personnel conductor = null;
 		String code = null;
-		
-		for(EmployeeConfigInfo employee : list){
+
+		for (EmployeeConfigInfo employee : list) {
 			conductor = employee.getSpy();
-			if(conductor != null){
+			if (conductor != null) {
 				code = conductor.getJobCode();
 				map = new HashMap<>();
 				map.put("id", code + "/" + conductor.getPersonnelName());
@@ -204,17 +210,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public List<Map<String, String>> findCarByLine(String lineCode) {
-		
+
 		List<CarConfigInfo> list = carConfigInfoRepository.findBylineCode(lineCode);
-		
+
 		List<Map<String, String>> rsList = new ArrayList<>();
 		Map<String, String> map = null;
 		Cars car = null;
 		String code = null;
-		
-		for(CarConfigInfo cci : list){
+
+		for (CarConfigInfo cci : list) {
 			car = cci.getCl();
-			if(car != null){
+			if (car != null) {
 				code = car.getInsideCode();
 				map = new HashMap<>();
 				map.put("id", code);
@@ -231,15 +237,262 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public Map<String, Object> save(ScheduleRealInfo t) {
 		SysUser user = SecurityUtils.getCurrentUser();
-		
+
 		t.setScheduleDate(new Date());
 		t.setCreateBy(user);
 		t.syncTime();
-		
+
 		Map<String, Object> map = super.save(t);
-		
-		//加入缓存
+
+		// 加入缓存
 		ScheduleBuffer.put(t);
 		return map;
 	}
+
+	@Override
+	public List<Map<String, String>> sreachVehic(String nbbm) {
+		// 转大写
+		nbbm = nbbm.toUpperCase();
+
+		List<Map<String, String>> list = new ArrayList<>();
+		Map<String, String> map;
+		Set<String> allSet = CommonMapped.vehicCompanyMap.keySet();
+
+		Line line;
+		for (String k : allSet) {
+			if (k.indexOf(nbbm) != -1) {
+				// 所属线路
+				map = new HashMap<>();
+				line = CommonMapped.vehicLineMap.get(k);
+				map.put("id", k);
+				map.put("text", k);
+				if (null != line) {
+					map.put("lineName", line.getName());
+					map.put("lineCode", line.getLineCode());
+				}
+
+				list.add(map);
+			}
+
+			if (list.size() > 20)
+				break;
+		}
+		return list;
+	}
+
+	@Override
+	public Map<String, Object> adjust(Long id, String nbbm, String jsy, String spy) {
+		// 班次
+		ScheduleRealInfo schedule = ScheduleBuffer.pkSchedulMap.get(id);
+
+		// 换车
+		if (!StringUtils.isBlank(nbbm)) {
+			adjustCar(schedule, nbbm);
+		}
+
+		List<String> tempArray;
+		// 换驾驶员
+		if (!StringUtils.isBlank(jsy)) {
+			tempArray = Splitter.on("/").splitToList(jsy);
+			adjustDriver(schedule, tempArray.get(0), tempArray.get(1));
+		}
+
+		// 换售票员
+		if (!StringUtils.isBlank(spy)) {
+			tempArray = Splitter.on("/").splitToList(spy);
+			adjustConductor(schedule, tempArray.get(0), tempArray.get(1));
+		}
+
+		ScheduleBuffer.persistentList.add(schedule);
+
+		Map<String, Object> map = new HashMap<>();
+		map.put("status", 200);
+		map.put("t", schedule);
+		return map;
+	}
+
+	@Override
+	public void adjustCar(ScheduleRealInfo schedule, String car) {
+		schedule.setClZbh(car);
+	}
+
+	@Override
+	public void adjustDriver(ScheduleRealInfo schedule, String driver, String driverName) {
+		schedule.setjGh(driver);
+		schedule.setjName(driverName);
+	}
+
+	@Override
+	public void adjustConductor(ScheduleRealInfo schedule, String conductor, String conductorName) {
+		schedule.setsGh(conductor);
+		schedule.setsName(conductorName);
+	}
+
+	@Override
+	public List<ScheduleRealInfo> queryUserInfo(String line, String date) {
+		// TODO Auto-generated method stub
+		return scheduleRealInfoRepository.queryUserInfo(line, date);
+	}
+
+	@Override
+	public List<ScheduleRealInfo> exportWaybill(String jName, String clZbh, String lpName) {
+		ReportUtils ee = new ReportUtils();
+		List<Iterator<?>> list = new ArrayList<Iterator<?>>();
+		List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.exportWaybill(jName, clZbh, lpName);
+		ScheduleRealInfo scheduleRealInfo = scheduleRealInfoRepository.findOne(scheduleRealInfos.get(0).getId());
+
+		File source = new File("D:\\export\\source");
+		File target = new File("D:\\export\\target");
+		if (!source.exists() && !source.isDirectory()) {
+			source.mkdirs();
+		}
+		if (!target.exists() && !target.isDirectory()) {
+			target.mkdirs();
+		}
+
+		list.add(scheduleRealInfos.iterator());
+		ee.excelReplace(list, new Object[] { scheduleRealInfo }, "D:\\export\\source\\waybill.xls",
+				"D:\\export\\target\\" + jName + ".xls");
+		return scheduleRealInfos;
+	}
+
+	@Override
+	public List<Map<String, Object>> dailyInfo(String line, String date) {
+		// TODO Auto-generated method stub
+		return scheduleRealInfoRepository.dailyInfo(line, date);
+	}
+
+	@Override
+	public List<ScheduleRealInfo> historyMessage(String line, String date, String code) {
+		// TODO Auto-generated method stub
+		return scheduleRealInfoRepository.historyMessage(line, date, code + "%");
+	}
+
+	@Override
+	public Map<Integer, Integer> trustStatus(String lineStr) {
+		List<String> lineList = Lists.newArrayList(Splitter.on(',').trimResults().omitEmptyStrings().split(lineStr));
+
+		Map<Integer, Integer> map = new HashMap<>();
+		Integer code;
+		for (String lineCode : lineList) {
+			code = Integer.parseInt(lineCode);
+			if (!ScheduleBuffer.trustMap.containsKey(lineCode))
+				ScheduleBuffer.trustMap.put(code, 0);
+
+			map.put(code, ScheduleBuffer.trustMap.get(code));
+		}
+		return map;
+	}
+
+	@Override
+	public Map<String, Object> realOutAdjust(Long id, String fcsjActual, String remarks) {
+		Map<String, Object> rs = new HashMap<>();
+		try {
+			ScheduleRealInfo sch = ScheduleBuffer.findOne(id);
+			String rq = sdfMonth.format(sch.getScheduleDate());
+
+			sch.setFcsjActualTime(sdfMinute.parse(rq + " " + fcsjActual).getTime());
+			sch.setFcsjActual(fcsjActual);
+			sch.addRemarks(remarks);
+
+			ScheduleBuffer.persistentList.add(sch);
+			rs.put("status", ResponseCode.SUCCESS);
+			rs.put("t", sch);
+		} catch (Exception e) {
+			logger.error("", e);
+			rs.put("status", ResponseCode.ERROR);
+		}
+
+		return rs;
+	}
+
+	@Override
+	public Map<String, Object> revokeDestroy(Long id) {
+		Map<String, Object> rs = new HashMap<>();
+		try {
+			ScheduleRealInfo sch = ScheduleBuffer.findOne(id);
+			if (sch.getStatus() != -1) {
+				rs.put("status", ResponseCode.ERROR);
+				rs.put("msg", "未烂班，无法撤销！");
+			} else {
+				sch.setStatus(0);
+				rs.put("status", ResponseCode.SUCCESS);
+				rs.put("t", sch);
+
+				// 将班次状态还原，并由子线程去匹配到离站
+			}
+		} catch (Exception e) {
+			logger.error("", e);
+			rs.put("status", ResponseCode.ERROR);
+		}
+		return rs;
+	}
+
+	@Override
+	public Map<String, Object> revokeRealOutgo(Long id) {
+		Map<String, Object> rs = new HashMap<>();
+		try {
+			ScheduleRealInfo sch = ScheduleBuffer.findOne(id);
+			if (sch.getFcsjActual() == null) {
+				rs.put("status", ResponseCode.ERROR);
+				rs.put("msg", "无实发时间，无法撤销！");
+			} else {
+				sch.setStatus(0);
+				sch.setFcsjActual("");
+				sch.setFcsjActualTime(0L);
+				rs.put("status", ResponseCode.SUCCESS);
+				rs.put("t", sch);
+
+				// 将班次状态还原，并由子线程去匹配到离站
+			}
+		} catch (Exception e) {
+			logger.error("", e);
+			rs.put("status", ResponseCode.ERROR);
+		}
+		return rs;
+	}
+
+	@Override
+	public Map<String, Object> spaceAdjust(Long[] ids, Integer space) {
+
+		List<ScheduleRealInfo> list = new ArrayList<>();
+		Map<String, Object> rs = new HashMap<>();
+		try {
+			ScheduleRealInfo sch;
+			for (Long id : ids) {
+				sch = ScheduleBuffer.findOne(id);
+				if (null != sch)
+					list.add(sch);
+			}
+
+			int size = list.size();
+			if(size == 0){
+				rs.put("status", ResponseCode.ERROR);
+			}
+			else{
+				// 按发车时间排序
+				Collections.sort(list, new ScheduleBuffer.ScheduleComparator());
+
+				// 以第一个待发时间为起点，调整间隔
+				Long st = list.get(0).getDfsjT()
+					,plus = space * 60 * 1000L;
+				
+				for(int i = 1; i < size; i ++){
+					st += plus;
+					sch = list.get(i);
+					sch.setDfsjAll(st);
+					
+					ScheduleBuffer.persistentList.add(sch);
+				}
+				
+				rs.put("status", ResponseCode.SUCCESS);
+				rs.put("list", list);
+			}
+			
+		} catch (Exception e) {
+			logger.error("", e);
+			rs.put("status", ResponseCode.ERROR);
+		}
+		return rs;
+	}
 }
@@ -4,8 +4,10 @@ import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import org.apache.commons.net.ftp.FTPClient;
@@ -96,16 +98,16 @@ public class FTPClientUtils {
 	}
 	// 将本地文件上传到FTP服务器上
-	public void testUpLoadFromDisk(File file,String name){
+	public void testUpLoadFromDisk(File file,String name,String url, int port, String username, String password, String remotePath){
 		 try { 
 		        FileInputStream in=new FileInputStream(file); 
-		       /*boolean flag = uploadFile("192.168.168.101", 21, "testftpservice", "123", "C:/ftptest", name, in);*/
+		        boolean flag = uploadFile(url, port,username, password, remotePath, name, in);
-		        boolean flag = uploadFile("222.66.0.205", 21, "transport", "transport123", "ftptest/", name, in);
+		      /* boolean flag = uploadFile("192.168.168.101", 21, "testftpservice", "123", "ftptest/", name, in);*/
-		        System.out.println(flag); 
+		       /* boolean flag = uploadFile("222.66.0.205", 21, "transport", "transport123", "ftptest/", name, in);*/
 		    } catch (FileNotFoundException e) { 
@@ -124,9 +126,7 @@ public class FTPClientUtils {
 			InputStream input = new ByteArrayInputStream(str.getBytes("utf-8"));
-			 boolean flag = uploadFile("192.168.168.101", 21, "testftpservice", "123", "ftptest/", "test.txt", input); 
-			
-			System.out.println(flag);
+			uploadFile("192.168.168.101", 21, "testftpservice", "123", "ftptest/", "test.txt", input); 
 		} catch (UnsupportedEncodingException e) {
@@ -150,11 +150,11 @@ public class FTPClientUtils {
      */  
     public static boolean deleteFtpFile(String url, int port, String username, String password, String remotePath, String fileName){  
-    	boolean success = true; 
+    	boolean success = false; 
         FTPClient ftp = new FTPClient(); 
-        try{ 
+        try { 
         	int reply;  
@@ -170,6 +170,8 @@ public class FTPClientUtils {
             // 登录  
             ftp.login(username, password);  
+            
+            
             reply = ftp.getReplyCode(); 
             if (!FTPReply.isPositiveCompletion(reply)) {
@@ -183,13 +185,14 @@ public class FTPClientUtils {
             ftp.changeWorkingDirectory(remotePath);
-           success = ftp.deleteFile("C:/ftptest"+ "/" + "aa.txt");
+            success = ftp.deleteFile(fileName);
+            
+            ftp.logout(); 
-            ftp.logout();  
         } catch (IOException e){  
-        	/*logger.error("save erro.", e);*/
         	e.printStackTrace();
+        	
             success = false;
         } finally {
@@ -201,8 +204,8 @@ public class FTPClientUtils {
                     ftp.disconnect();
                 } catch (IOException e) {  
+                	
                 	e.printStackTrace();
-                   /* logger.error(EXCEPTION_NAME, e);  */
                 }  
             }  
@@ -211,26 +214,119 @@ public class FTPClientUtils {
         return success;  
     }  
+    public static File GetFtpFile(String url, int port, String username, String password, String remotePath, String fileName){  
+    	
+        FTPClient ftp = new FTPClient(); 
+        
+        File destFile = new File(fileName); 
+        
+        InputStream in = null; 
+        
+        OutputStream out = null; 
+        
+        try { 
+        	
+        	int reply;  
+              
+            // 连接FTP服务器  
+            if (port > -1)
+            	
+            	ftp.connect(url, port);
+                
+            else  
+            	
+                ftp.connect(url);  
+              
+            // 登录  
+            ftp.login(username, password);  
+            
+            reply = ftp.getReplyCode(); 
+            
+            if (!FTPReply.isPositiveCompletion(reply)) {
+            	
+            	ftp.disconnect(); 
+            	
+            }  
+              
+            // 转移到FTP服务器目录  
+            
+            ftp.changeWorkingDirectory(remotePath);
+            
+            File srcFile = new File(fileName);  
+            
+            int byteread = 0; // 读取的字节数
+            
+            in =  ftp.retrieveFileStream(fileName); 
+            
+            out = new FileOutputStream(destFile);
+            
+            byte[] buffer = new byte[1024];  
+  
+            while ((byteread = in.read(buffer)) != -1) { 
+            	
+                out.write(buffer, 0, byteread);  
+                
+            }  
+            
+            ftp.logout(); 
+            
+        } catch (IOException e){  
+        	
+        	e.printStackTrace();
+        	
+        } finally {
+        	
+        	try { 
+        		
+                if (out != null) 
+                	
+                    out.close();
+                
+                if (in != null) 
+                	
+                    in.close();
+                
+            } catch (IOException e) { 
+            	
+                e.printStackTrace(); 
+                
+            }
+        	
+        	if (ftp.isConnected()) {
+        		
+        		try { 
+        			
+                    ftp.disconnect();
+                    
+                } catch (IOException e) {  
+                	
+                	e.printStackTrace();
+                	
+                }  
+            }  
+        }  
+        
+        return destFile;  
+    }  
+	
+    
 	public static void main(String[] args) {
 		FTPClientUtils clientUtils = new FTPClientUtils();
 		Test test= new Test();
-	/*	File[] sources = new File[] {new File("E:/20079.txt")};
+		File[] sources = new File[] {new File("E:/20079.txt")};
 		File target = new File("release_package.tar.gz");
 		File targetFile = test.pack(sources, target);
-		clientUtils.testUpLoadFromDisk(targetFile,targetFile.getName());*/
+	/*	clientUtils.testUpLoadFromDisk(targetFile,targetFile.getName());*/
-		/*, 21, , "123", "C:/ftptest", "test.txt", input*/
-		boolean a =clientUtils.deleteFtpFile("192.168.168.101", 21, "testftpservice", "123", "ftptest", "aa.txt");
+		/** 删除文件 */
+		/*boolean a =clientUtils.deleteFtpFile("192.168.168.101", 21, "testftpservice", "123", "ftptest/", "release_package.tar.gz");*/
-		System.out.println(a);
-		  
-		 
 	}
 }
+package com.bsth.util;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import com.bsth.entity.Line;
+
+public class ReportRelatedUtils {
+	public static void main(String[] args) {
+		try {
+			ReportRelatedUtils test = new ReportRelatedUtils();
+			Line line = new Line();
+			line.setId(10);
+			line.setName("abc");
+			test.getValue(line, "name");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+	}
+
+	/**
+	 * 通过字段名取到对象中该字段的相应值
+	 * 
+	 * @param t
+	 *            对象
+	 * @param fieldName
+	 *            字段名
+	 * @return
+	 * @throws ClassNotFoundException
+	 * @throws IllegalAccessException
+	 * @throws InvocationTargetException
+	 * @throws NoSuchMethodException
+	 * @throws NoSuchFieldException
+	 */
+	public <T> Object getValue(T t, String fieldName)
+			throws ClassNotFoundException, IllegalAccessException,
+			InvocationTargetException, NoSuchMethodException,
+			NoSuchFieldException {
+		Object value = "";
+		String tmpFieldName = firstCharToUpperCase(fieldName);
+		Method method = null;
+		try {
+			method = t.getClass().getMethod("get" + tmpFieldName);
+			value = method.invoke(t);
+		} catch (NoSuchMethodException e) {
+			if(method == null){
+				method = t.getClass().getMethod("get" + tmpFieldName);
+			}
+			value = method.invoke(t);
+			return value;
+		}
+		return value;
+	}
+
+	/**
+	 * 首字母大写
+	 * 
+	 * @param source
+	 *            源字符串
+	 * @return
+	 */
+	private String firstCharToUpperCase(String source) {
+		char[] arr = source.toCharArray();
+		if (arr[1] >= 'A' && arr[1] <= 'Z') {
+			return source;
+		}else{
+			if (arr[0] >= 'a' && arr[0] <= 'z') {
+				arr[0] -= 'a' - 'A';
+			}
+		}
+		return new String(arr);
+	}
+}
+package com.bsth.util;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+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.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.ss.usermodel.Cell;
+
+import com.bsth.entity.Line;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
+public class ReportUtils {
+	// private final String packaegName = "com.bsth.entity.";
+	private final String packaegName = "com.bsth.entity.realcontrol.";
+
+	/**
+	 * /**
+	 * 
+	 * @param list
+	 *            模板中，需要重复显示的行所需的数据
+	 * @param map
+	 *            模板中除以上list外所有的数据
+	 * @param index
+	 *            需要重复的行号，该值为行号减1
+	 * @param sourcePath
+	 *            模板路径
+	 * @param targetPath
+	 *            生成路径
+	 */
+	public void excelReplace(List<Iterator<?>> list, Object[] tArray,
+			String sourcePath, String targetPath) {
+		try {
+			// 把源文件放入流中
+			POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(
+					sourcePath));
+			HSSFWorkbook wb = new HSSFWorkbook(fs);
+			HSSFSheet sheet = wb.getSheetAt(0);
+			HSSFRow row;
+			HSSFCell cell = null;
+			String key;
+			// 取得总行数
+			int rowNum = sheet.getLastRowNum();
+			// 取得总列数
+			int cellNum = sheet.getRow(0).getLastCellNum();
+
+			// 遍历行
+			for (int i = 0; i < rowNum; i++) {
+				row = sheet.getRow(i);
+				// 遍历列
+				for (int j = 0; j < cellNum; j++) {
+					if (row == null) {
+						continue;
+					}
+					cell = row.getCell(j);
+					if (cell == null) {
+						continue;
+					}
+					// 取得每列的内容，如果列内容是$key$格式，则替换内容
+					key = cell.getStringCellValue();
+					if (key.indexOf("$") != -1 || key.indexOf("#list#") != -1) {
+						// * 列中内容有#list#，则表示该行为模板行，需要以该行为模板
+						// * 例如：模板行格式 #list#0_0 $Car.id$
+						// * 第一个0表示需要在list中取iterator的索引值
+						// * 第二个0表示在iterator中取的第几个对象，如果不为0，则取下一个对象，而不是沿用前面获取的对象
+						// * $Car.id$表示所取的对象为Car的对象，并且取值为id的值
+						if (key.indexOf("#list#") != -1) {
+							key = key.replace("#list#", "").trim();
+							String[] lists = key.split(" ");
+							// 取得list中的索引值
+							int listIndex = Integer
+									.valueOf(lists[0].split("_")[0]);
+							Iterator<?> iterator = list.get(listIndex);
+							// 根据模板创建行并填弃数据，返回增加的行数
+							int rowCount = iteratorFillCellValue(wb, sheet,
+									cell, iterator, i, rowNum, key);
+							rowNum += rowCount;
+							i += rowCount;
+							break;
+						} else {
+							// 直接填充数据的列，从对象数组中取得值
+							getValueAndSetCellValue(cell, key, tArray);
+						}
+					}
+
+				}
+			}
+			// 创建目标文件夹
+			createFolder(targetPath);
+			// 输出文件
+			FileOutputStream fileOut = new FileOutputStream(targetPath);
+			wb.write(fileOut);
+			fileOut.close();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * 根据iterator，以及模板中的标识，填充模板
+	 * 
+	 * @param wb
+	 * @param sheet
+	 * @param cell
+	 * @param iterator
+	 *            iterator
+	 * @param index
+	 *            模板行索引
+	 * @param rowNum
+	 *            表格总行数
+	 * @param key
+	 *            表格内容
+	 * @return
+	 */
+	private int iteratorFillCellValue(HSSFWorkbook wb, HSSFSheet sheet,
+			HSSFCell cell, Iterator<?> iterator, int index, int rowNum,
+			String key) {
+		int rowCount = 0;
+		Object obj = null;
+		int p = 0;
+		int i = index;
+		HSSFRow newRow = null;
+		int tmpCellNum = 0;
+		int k = 0;
+		// 取得模板行
+		HSSFRow orgRow = sheet.getRow(index);
+		try {
+			while (iterator.hasNext()) {
+				// 取得iterator的对象
+				obj = iterator.next();
+				// 移动当前编辑行以下的所有行
+				if (p != 0) {
+					rowNum += 1;
+					i += 1;
+					rowCount += 1;// 增加的总行数
+					// 把当前行以下的所有行往下移动1行
+					sheet.shiftRows(i, rowNum, 1);
+				}
+				p = 1;
+				// 创建新行
+				newRow = sheet.createRow(index + k++);
+				// 把新行的内容换成和模板行一样
+				copyRow(wb, orgRow, newRow, true);
+				tmpCellNum = newRow.getLastCellNum();
+				for (int l = 0; l < tmpCellNum; l++) {
+					cell = newRow.getCell(l);
+					key = cell.getStringCellValue();
+					/**
+					 * 如果单无格内容为#list#，表示该行是模板行 #list#0_0
+					 * 第一个0表示需要在list中取iterator的索引值
+					 * 第二个0表示在iterator中取的第几个对象，如果不为0，则取下一个对象，而不是沿用前面获取的对象
+					 */
+					if (key.indexOf("#list#") != -1 && key.indexOf("_0") == -1) {
+						if (iterator.hasNext()) {
+							obj = iterator.next();
+						} else {
+							obj = null;
+						}
+					}
+					if (key.trim().indexOf(" ") != -1) {
+						key = key.split(" ")[1];
+					}
+					getValueAndSetCellValue(cell, key, obj);
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return rowCount;
+	}
+
+	/**
+	 * 取到相应的值并填入相应的列中
+	 * 
+	 * @param cell
+	 *            列
+	 * @param key
+	 *            列内容
+	 * @param obj
+	 *            数据源对象
+	 */
+	private void getValueAndSetCellValue(HSSFCell cell, String key, Object obj) {
+		try {
+			// 保有存单元格的内容
+			String cellValue = key = key.replace("\\n", "");
+			String tmpKey;
+			// 循环截取两个$中间的内容，反射出值
+			while (key.indexOf("$") != -1) {
+				key = key.substring(key.indexOf("$") + 1);
+				// 取两个$中间的内容
+				tmpKey = key.substring(0, key.indexOf("$"));
+				key = key.substring(key.indexOf("$") + 1);
+				// 如果内容是如下格式Cars.id，则从obj中值得相应的对象的值
+				if (tmpKey.indexOf(".") != -1) {
+					String className = tmpKey.substring(0, tmpKey.indexOf("."));
+					// 取得类的全限定名
+					String classWholeName = packaegName + className;
+					String fieldName = tmpKey.substring(tmpKey.indexOf(".") + 1);
+					// 如果obj是数组，循环判断哪个对象是对应的
+					if (obj instanceof Object[]) {
+						Object[] objs = (Object[]) obj;
+						for (int k = 0; k < objs.length; k++) {
+							if (objs[k].getClass().getName().equals(classWholeName)) {
+								cellValue = cellValue.replace("$" + tmpKey
+										+ "$", getKeyValue(objs[k], fieldName)
+										+ "");
+							}
+						}
+					} else if (obj.getClass().getName().equals(classWholeName)) {
+						cellValue = cellValue.replace("$" + tmpKey + "$",getKeyValue(obj, fieldName) + "");
+					}
+				}
+			}
+			cell.setCellValue(cellValue);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+	}
+
+	/**
+	 * 给列填充数据
+	 * 
+	 * @param cell
+	 *            列
+	 * @param obj
+	 *            数据源对象
+	 * @param fieldName
+	 *            需要取数据的字段
+	 */
+	private Object getKeyValue(Object obj, String fieldName) {
+		Object value = "";
+		try {
+			if (obj != null) {
+				ReportRelatedUtils test = new ReportRelatedUtils();
+				value = test.getValue(obj, fieldName) == null ? "" : test .getValue(obj, fieldName);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return value;
+	}
+
+	public static void main(String[] args) {
+
+		try {
+			ReportUtils ee = new ReportUtils();
+			List<Iterator<?>> list = new ArrayList<Iterator<?>>();
+			Line line = new Line();
+			line.setId(1);
+			line.setName("line1");
+
+			List<Object> dataList = new ArrayList<Object>();
+			
+
+			ScheduleRealInfo srr = new ScheduleRealInfo();
+			srr.setId((long) 111);
+			srr.setXlName("abc11");
+			
+			ScheduleRealInfo sr = new ScheduleRealInfo();
+			sr.setId((long) 22);
+			sr.setXlName("abc22");
+			dataList.add(sr);
+			sr = new ScheduleRealInfo();
+			sr.setId((long) 33);
+			sr.setXlName("abc33");
+			dataList.add(sr);
+			list.add(dataList.iterator());
+			
+			ee.excelReplace(list, new Object[] { srr }, "D:\\55.xls",
+					"D:\\22.xls");
+			System.out.println("ok");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * 行复制功能
+	 * 
+	 * @param fromRow
+	 * @param toRow
+	 */
+	private void copyRow(HSSFWorkbook wb, HSSFRow fromRow, HSSFRow toRow,
+			boolean copyValueFlag) {
+		for (Iterator<Cell> cellIt = fromRow.cellIterator(); cellIt.hasNext();) {
+			HSSFCell tmpCell = (HSSFCell) cellIt.next();
+			HSSFCell newCell = toRow.createCell(tmpCell.getColumnIndex(), 0);
+			copyCell(wb, tmpCell, newCell, copyValueFlag);
+		}
+	}
+
+	/**
+	 * 复制单元格
+	 * 
+	 * @param srcCell
+	 * @param distCell
+	 * @param copyValueFlag
+	 *            true则连同cell的内容一起复制
+	 */
+	public void copyCell(HSSFWorkbook wb, HSSFCell srcCell, HSSFCell distCell,
+			boolean copyValueFlag) {
+		HSSFCellStyle newstyle = wb.createCellStyle();
+		copyCellStyle(wb, srcCell.getCellStyle(), newstyle);
+		// 样式
+		distCell.setCellStyle(newstyle);
+		// 评论
+		if (srcCell.getCellComment() != null) {
+			distCell.setCellComment(srcCell.getCellComment());
+		}
+		// 不同数据类型处理
+		int srcCellType = srcCell.getCellType();
+		distCell.setCellType(srcCellType);
+		if (copyValueFlag) {
+			if (srcCellType == HSSFCell.CELL_TYPE_NUMERIC) {
+				distCell.setCellValue(srcCell.getDateCellValue());
+			} else if (srcCellType == HSSFCell.CELL_TYPE_STRING) {
+				distCell.setCellValue(srcCell.getRichStringCellValue());
+			} else if (srcCellType == HSSFCell.CELL_TYPE_BLANK) {
+
+			} else if (srcCellType == HSSFCell.CELL_TYPE_BOOLEAN) {
+				distCell.setCellValue(srcCell.getBooleanCellValue());
+			} else if (srcCellType == HSSFCell.CELL_TYPE_ERROR) {
+				distCell.setCellErrorValue(srcCell.getErrorCellValue());
+			} else if (srcCellType == HSSFCell.CELL_TYPE_FORMULA) {
+				distCell.setCellFormula(srcCell.getCellFormula());
+			} else {
+			}
+		}
+	}
+
+	/**
+	 * 复制一个单元格样式到目的单元格样式
+	 * 
+	 * @param fromStyle
+	 * @param toStyle
+	 */
+	public void copyCellStyle(HSSFWorkbook wb, HSSFCellStyle fromStyle,
+			HSSFCellStyle toStyle) {
+		toStyle.setAlignment(fromStyle.getAlignment());
+		// 边框和边框颜色
+		toStyle.setBorderBottom(fromStyle.getBorderBottom());
+		toStyle.setBorderLeft(fromStyle.getBorderLeft());
+		toStyle.setBorderRight(fromStyle.getBorderRight());
+		toStyle.setBorderTop(fromStyle.getBorderTop());
+		toStyle.setTopBorderColor(fromStyle.getTopBorderColor());
+		toStyle.setBottomBorderColor(fromStyle.getBottomBorderColor());
+		toStyle.setRightBorderColor(fromStyle.getRightBorderColor());
+		toStyle.setLeftBorderColor(fromStyle.getLeftBorderColor());
+
+		// 背景和前景
+		toStyle.setFillBackgroundColor(fromStyle.getFillBackgroundColor());
+		toStyle.setFillForegroundColor(fromStyle.getFillForegroundColor());
+
+		toStyle.setDataFormat(fromStyle.getDataFormat());
+		toStyle.setFillPattern(fromStyle.getFillPattern());
+		toStyle.setHidden(fromStyle.getHidden());
+		toStyle.setIndention(fromStyle.getIndention());// 首行缩进
+		toStyle.setLocked(fromStyle.getLocked());
+		toStyle.setRotation(fromStyle.getRotation());// 旋转
+		toStyle.setVerticalAlignment(fromStyle.getVerticalAlignment());
+		toStyle.setWrapText(fromStyle.getWrapText());
+		// 字体
+		toStyle.setFont(fromStyle.getFont(wb));
+
+	}
+
+	/**
+	 * 创建文件夹，并删除原有文件
+	 * 
+	 * @param path
+	 */
+	private void createFolder(String path) {
+		File targetFile = null;
+		targetFile = new File(path);
+		if (targetFile.exists()) {// 删除原有文件
+			targetFile.delete();
+		}
+		// 创建目标文件夹
+		targetFile = new File(path.substring(0, path.lastIndexOf("\\")));
+		if (!targetFile.exists()) {
+			targetFile.mkdirs();
+		}
+	}
+
+}
@@ -24,35 +24,57 @@ public class Test {
 	  * @throws
 	  */
 	 public static File pack(File[] sources, File target){
-	  FileOutputStream out = null;
-	  try {
-	   out = new FileOutputStream(target);
-	  } catch (FileNotFoundException e1) {
-	   e1.printStackTrace();
-	  }
-	  TarArchiveOutputStream os = new TarArchiveOutputStream(out);
-	  for (File file : sources) {
-	   try {
-	    os.putArchiveEntry(new TarArchiveEntry(file));
-	    IOUtils.copy(new FileInputStream(file), os);
-	    os.closeArchiveEntry();
-	     
-	   } catch (FileNotFoundException e) {
-	    e.printStackTrace();
-	   } catch (IOException e) {
-	    e.printStackTrace();
-	   } 
-	  }
-	  if(os != null) {
-	   try {
-	    os.flush();
-	    os.close();
-	   } catch (IOException e) {
-	    e.printStackTrace();
-	   }
-	  }
+		 
+		 FileOutputStream out = null;
+		 
+		 try {
+			 
+			 out = new FileOutputStream(target);
+			 
+		 } catch (FileNotFoundException e1) {
+			 
+			 e1.printStackTrace();
+			 
+		 }
+		 
+		 TarArchiveOutputStream os = new TarArchiveOutputStream(out);
+		 
+		 for (File file : sources) {
+			 
+			 try {
+				 
+				 os.putArchiveEntry(new TarArchiveEntry(file));
+				 
+				 IOUtils.copy(new FileInputStream(file), os);
+				 
+				 os.closeArchiveEntry();
+				 
+			 } catch (FileNotFoundException e) {
+				 
+				 e.printStackTrace();
+				 
+			 } catch (IOException e) { 
+				 
+				 e.printStackTrace();
+				 
+			 } 
+		 }
+		 if(os != null) {
+			 
+			 try {
+				 
+				 os.flush();
+				 
+				 os.close();
+				 
+			 } catch (IOException e) {
+				 
+				 e.printStackTrace();
+			 }
+	 	 }
 	  return target;
+	  
 	 }
 	 /**
@@ -12,7 +12,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.vehicle.directive.buffer.DirectiveBuffer;
 import com.bsth.vehicle.directive.entity.DirectiveReply;
-import com.bsth.vehicle.directive.entity.DriverReport;
+import com.bsth.vehicle.directive.entity.Directive80;
 /**
  * 
@@ -33,7 +33,7 @@ public class UpstreamEntrance {
 	@RequestMapping(value = "/upstream" , method = RequestMethod.POST)
 	public int main(@RequestParam String json){
-		logger.info(json);
+		logger.info("upstream: " + json);
 		JSONObject jsonParam = JSONObject.parseObject(json);
 		//46和47 调度指令确认
@@ -46,11 +46,13 @@ public class UpstreamEntrance {
 				logger.error("NumberFormatException ,,,,一般是老数据，msgId太大");
 			}
 		}
-		//80协议，驾驶员上报
+		//80协议
 		else if(jsonParam.getInteger("operCode") == 0X80){
 			try{
-				DriverReport report = JSON.toJavaObject(jsonParam, DriverReport.class);
-				directiveBuffer.jsyReport(report);
+				Directive80 report = JSON.toJavaObject(jsonParam, Directive80.class);
+				//驾驶员上报
+				if(report.getData().getOperCode2() == 0x26)
+					directiveBuffer.jsyReport(report);
 			}catch(Exception e){
 				logger.error("", e);
 			}
@@ -2,7 +2,9 @@ package com.bsth.vehicle.common;
 import java.util.Map;
+import com.bsth.entity.Line;
 import com.google.common.collect.BiMap;
+import com.google.common.collect.TreeMultimap;
 /**
  * 
@@ -35,9 +37,20 @@ public class CommonMapped {
 	public static Map<String , String> vehicCompanyMap;
 	/**
+	 * 车辆和线路对照
+	 */
+	public static Map<String, Line> vehicLineMap;
+	
+	/**
 	 * 站点编码和名称对照，包括停车场
 	 *（K: 站点编码 ，V：站点名称）
 	 */
 	public static Map<String, String> stationCodeMap;
+	
+	/**
+	 * 线路和用户名对照
+	 * 用于webSocket定向推送消息
+	 */
+	public static TreeMultimap<Integer, String> lineUserMap = TreeMultimap.create();
 }
@@ -11,10 +11,13 @@ import org.springframework.stereotype.Component;
 import com.bsth.entity.CarPark;
 import com.bsth.entity.Cars;
+import com.bsth.entity.Line;
 import com.bsth.entity.Station;
+import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.repository.CarParkRepository;
 import com.bsth.repository.CarsRepository;
 import com.bsth.repository.StationRepository;
+import com.bsth.repository.schedule.CarConfigInfoRepository;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
@@ -38,6 +41,9 @@ public class CommonRefreshThread extends Thread{
 	@Autowired
 	CarParkRepository carParkRepository;
+	@Autowired
+	CarConfigInfoRepository carConfigInfoRepository;
+	
 	Logger logger = LoggerFactory.getLogger(this.getClass());
 	@Override
@@ -45,13 +51,33 @@ public class CommonRefreshThread extends Thread{
 		try {
 			initVehicMapp();
 			initStationCodeMap();
+			initVehicLineMap();
 		} catch (Exception e) {
+			e.printStackTrace();
 			logger.error("", e);
 		}
 	}
 	/**
 	 * 
+	 * @Title: initVehicLineMap 
+	 * @Description: TODO(根据车辆配置，加载车辆和线路对照数据) 
+	 * @throws
+	 */
+	private void initVehicLineMap() {
+		Iterator<CarConfigInfo> allIterator = carConfigInfoRepository.findAll().iterator();
+		Map<String, Line> ccMap = new HashMap<>();
+		
+		CarConfigInfo cci;
+		while(allIterator.hasNext()){
+			cci = allIterator.next();
+			ccMap.put(cci.getCl().getInsideCode(), cci.getXl());
+		}
+		CommonMapped.vehicLineMap = ccMap;
+	}
+
+	/**
+	 * 
 	 * @Title: initDeviceMapp 
 	 * @Description: TODO(初始化车辆相关对照) 
 	 */
@@ -10,7 +10,7 @@ package com.bsth.vehicle.directive;
  */
 public class MsgIdGenerator {
-	private static int msgId = 0;
+	private static int msgId = 1;
 	public synchronized static int getMsgId(){
 		msgId ++;
@@ -9,13 +9,20 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.bsth.vehicle.directive.entity.Directive;
+import com.bsth.service.realcontrol.buffer.ScheduleBuffer;
+import com.bsth.vehicle.common.CommonMapped;
+import com.bsth.vehicle.directive.entity.Directive60;
 import com.bsth.vehicle.directive.entity.DirectiveReply;
-import com.bsth.vehicle.directive.entity.DriverReport;
+import com.bsth.vehicle.directive.entity.Directive80;
+import com.bsth.vehicle.directive.entity.DirectiveC0;
+import com.bsth.vehicle.directive.entity.DirectiveC0.DirectiveC0Data;
 import com.bsth.vehicle.directive.entity.LineChange;
-import com.bsth.vehicle.directive.repository.DriverReportRepository;
+import com.bsth.vehicle.directive.repository.Directive80Repository;
 import com.bsth.vehicle.directive.repository.LineChangeRepository;
+import com.bsth.vehicle.directive.util.HttpUtils;
+import com.bsth.websocket.handler.RealControlSocketHandler;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
@@ -33,15 +40,16 @@ public class DirectiveBuffer {
 	Logger logger = LoggerFactory.getLogger(this.getClass());
 	@Autowired
-	DriverReportRepository driverReportRepository;
+	Directive80Repository d80Repository;
 	@Autowired
 	LineChangeRepository lineChangeRepository;
+	
 	/**
 	 * 等待入库的调度指令
 	 */
-	public static LinkedList<Directive> transientList;
+	public static LinkedList<Directive60> transientList;
 	/**
 	 * 等待确认的线路切换指令
@@ -51,13 +59,16 @@ public class DirectiveBuffer {
 	/**
 	 * 当日调度指令缓存
 	 */
-	private static Map<Integer, Directive> directiveMap;
+	private static Map<Integer, Directive60> directiveMap;
 	/**
 	 * 驾驶员上报数据
 	 * {K: 线路编码}
 	 */
-	private static Multimap<Integer, DriverReport> reportMultiMap;
+	private static Multimap<Integer, Directive80> reportMultiMap;
+	
+	@Autowired
+	RealControlSocketHandler socketHandler;
 	static{
 		transientList = new LinkedList<>();
@@ -66,7 +77,7 @@ public class DirectiveBuffer {
 		changeMap = new HashMap<>();
 	}
-	public static void put(Directive directive){
+	public static void put(Directive60 directive){
 		directiveMap.put(directive.getMsgId(), directive);
 	}
@@ -83,7 +94,7 @@ public class DirectiveBuffer {
 			return;
 		}
-		Directive directive = directiveMap.get(msgId);
+		Directive60 directive = directiveMap.get(msgId);
 		if(null == directive){
 			//无效的响应
@@ -107,6 +118,7 @@ public class DirectiveBuffer {
 		}
 		if(directive.isDispatch()){
+			//更新班次状态
 			directive.getSch().setDirectiveState(reply.getStatus() * 100);
 		}
 		transientList.add(directive);
@@ -146,10 +158,51 @@ public class DirectiveBuffer {
 	 * @Description: TODO(80 驾驶员上报) 
 	 * @throws
 	 */
-	public void jsyReport(DriverReport report){
-		logger.info("驾驶员上报");
+	public void jsyReport(Directive80 report){
+		//将托管的线路自动处理掉
+		Integer lineCode = report.getData().getLineId();
+		Integer status = ScheduleBuffer.trustMap.get(lineCode);
+		//请求代码
+		Short requestCode = report.getData().getRequestCode();
+		//托管
+		if(null == status || status == 0){
+			//自动处理出场请求
+			if(requestCode == 0xA3){
+				DirectiveC0 c0 = createC0(report, (short)0x06);
+				HttpUtils.postJson(JSON.toJSONString(c0));
+				report.setC0(c0);
+				d80Repository.save(report);
+			}
+		}
+		
 		//实时入库
-		driverReportRepository.save(report);
-		reportMultiMap.put(report.getData().getLineId(), report);
+		d80Repository.save(report);
+		reportMultiMap.put(lineCode, report);
+		//推送到页面
+		report.getData().setNbbm(CommonMapped.vehicDeviceBiMap.get(report.getDeviceId()));
+		JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(report));
+		json.put("fn", "report80");
+ 		socketHandler.sendMessageToLine(lineCode, json.toJSONString());
+	}
+	
+	/**
+	 * 
+	 * @Title: createC0 
+	 * @Description: TODO(生成C0数据) 
+	 * @param @param ack
+	 * @throws
+	 */
+	public DirectiveC0 createC0(Directive80 report, short ack){
+		DirectiveC0 c0 = new DirectiveC0();
+		c0.setDeviceId(report.getDeviceId());
+		c0.setTimestamp(report.getTimestamp());
+		c0.setOperCode((short)0xC0);
+		
+		DirectiveC0Data data = new DirectiveC0Data();
+		data.setOperCode2((short)0x86);
+		data.setRequestAck(ack);
+		
+		c0.setData(data);
+		return c0;
 	}
 }
@@ -36,6 +36,18 @@ public class DirectiveController {
 	/**
 	 * 
+	 * @Title: send60Dispatch 
+	 * @Description: TODO(班次信息下发) 
+	 * @param @param id
+	 * @throws
+	 */
+	@RequestMapping(value = "/dispatch", method = RequestMethod.POST)
+	public int send60Dispatch(@RequestParam Long id){
+		return directiveService.send60Dispatch(id);
+	}
+	
+	/**
+	 * 
 	 * @Title: lineChange 
 	 * @Description: TODO(切换线路) 
 	 * @param @param nbbm 车辆内部编码
@@ -46,4 +58,17 @@ public class DirectiveController {
 	public int lineChange(@RequestParam String nbbm, @RequestParam Integer lineId){
 		return directiveService.lineChange(nbbm, lineId);
 	}
+	
+	/**
+	 * 
+	 * @Title: upDownChange 
+	 * @Description: TODO(上下行切换) 
+	 * @param @param nbbm 车辆内部编码
+	 * @param @param upDon
+	 * @throws
+	 */
+	@RequestMapping(value = "/upDownChange", method = RequestMethod.POST)
+	public int upDownChange(@RequestParam String nbbm, @RequestParam Integer upDown){
+		return directiveService.upDownChange(nbbm, upDown);
+	}
 }
@@ -9,6 +9,7 @@ import javax.persistence.Table;
 import javax.persistence.Transient;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.sys.SysUser;
 /**
@@ -21,7 +22,7 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
  */
 @Entity
 @Table(name = "bsth_v_directive_60")
-public class Directive {
+public class Directive60 {
 	@Id
     @GeneratedValue
@@ -77,6 +78,12 @@ public class Directive {
 	@ManyToOne
 	private ScheduleRealInfo sch;
+	/**
+	 * 发送人
+	 */
+	@ManyToOne
+	private SysUser sender;
+	
 	@Embeddable
 	public static class DirectiveData {
 		// 公司代码
@@ -99,7 +106,7 @@ public class Directive {
 		 *  0x03表示运营状态指令(闹钟无效) 
 		 *  0x04表示其他指令
 		 */
-		private DispatchInstruct dispatchInstruct;
+		private Short dispatchInstruct;
 		// 唯一标识
 		private int msgId;
@@ -145,11 +152,11 @@ public class Directive {
 			this.instructType = instructType;
 		}
-		public DispatchInstruct getDispatchInstruct() {
+		public Short getDispatchInstruct() {
 			return dispatchInstruct;
 		}
-		public void setDispatchInstruct(DispatchInstruct dispatchInstruct) {
+		public void setDispatchInstruct(Short dispatchInstruct) {
 			this.dispatchInstruct = dispatchInstruct;
 		}
@@ -265,4 +272,12 @@ public class Directive {
 	public void setSch(ScheduleRealInfo sch) {
 		this.sch = sch;
 	}
+
+	public SysUser getSender() {
+		return sender;
+	}
+
+	public void setSender(SysUser sender) {
+		this.sender = sender;
+	}
 }
@@ -4,7 +4,12 @@ import javax.persistence.Embeddable;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.NamedAttributeNode;
+import javax.persistence.NamedEntityGraph;
+import javax.persistence.NamedEntityGraphs;
+import javax.persistence.OneToOne;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 /**
  * 
@@ -16,7 +21,12 @@ import javax.persistence.Table;
  */
 @Entity
 @Table(name = "bsth_v_report_80")
-public class DriverReport {
+@NamedEntityGraphs({
+    @NamedEntityGraph(name = "directive80_c0", attributeNodes = {
+            @NamedAttributeNode("c0")
+    })
+})
+public class Directive80 {
 	@Id
 	@GeneratedValue
@@ -33,15 +43,24 @@ public class DriverReport {
 	private Long timestamp;
 	/**
-	 * 一级协议
+	 * 一级协议 0xC0
 	 */
 	private Short operCode;
 	private DriverReportData data;
+	
+	/**
+	 * c0 回复
+	 */
+	@OneToOne
+	private DirectiveC0 c0;
 	@Embeddable
 	public static class DriverReportData {
+		/**
+		 * 0x86
+		 */
 		private Short operCode2;
 		/**
@@ -54,7 +73,13 @@ public class DriverReport {
 		 * 线路编码
 		 */
 		private Integer lineId;
-
+		
+		/**
+		 * 车辆内部编码
+		 */
+		@Transient
+		private String nbbm;
+		
 		public Short getOperCode2() {
 			return operCode2;
 		}
@@ -78,6 +103,14 @@ public class DriverReport {
 		public void setLineId(Integer lineId) {
 			this.lineId = lineId;
 		}
+
+		public String getNbbm() {
+			return nbbm;
+		}
+
+		public void setNbbm(String nbbm) {
+			this.nbbm = nbbm;
+		}
 	}
 	public Integer getId() {
@@ -119,4 +152,12 @@ public class DriverReport {
 	public void setData(DriverReportData data) {
 		this.data = data;
 	}
+
+	public DirectiveC0 getC0() {
+		return c0;
+	}
+
+	public void setC0(DirectiveC0 c0) {
+		this.c0 = c0;
+	}
 }
+package com.bsth.vehicle.directive.entity;
+
+import javax.persistence.Embeddable;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+/**
+ * 
+ * @ClassName: DirectiveC0
+ * @Description: TODO(C0协议，回复驾驶员上报)
+ * @author PanZhao
+ * @date 2016年7月8日 上午10:19:23
+ *
+ */
+@Entity
+@Table(name = "bsth_v_C0")
+public class DirectiveC0 {
+
+	@Id
+	@GeneratedValue
+	private Integer id;
+
+	/**
+	 * 设备号
+	 */
+	private String deviceId;
+
+	/**
+	 * 时间戳
+	 */
+	private Long timestamp;
+
+	/**
+	 * 一级协议
+	 */
+	private Short operCode;
+	
+	private DirectiveC0Data data;
+
+	@Embeddable
+	public static class DirectiveC0Data {
+
+		/**
+		 * 二级协议
+		 */
+		private Short operCode2;
+
+		/**
+		 * 请求应答字 0x06同意 0x15不同意
+		 */
+		private Short requestAck;
+
+		public Short getOperCode2() {
+			return operCode2;
+		}
+
+		public void setOperCode2(Short operCode2) {
+			this.operCode2 = operCode2;
+		}
+
+		public Short getRequestAck() {
+			return requestAck;
+		}
+
+		public void setRequestAck(Short requestAck) {
+			this.requestAck = requestAck;
+		}
+	}
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getDeviceId() {
+		return deviceId;
+	}
+
+	public void setDeviceId(String deviceId) {
+		this.deviceId = deviceId;
+	}
+
+	public Long getTimestamp() {
+		return timestamp;
+	}
+
+	public void setTimestamp(Long timestamp) {
+		this.timestamp = timestamp;
+	}
+
+	public Short getOperCode() {
+		return operCode;
+	}
+
+	public void setOperCode(Short operCode) {
+		this.operCode = operCode;
+	}
+
+	public DirectiveC0Data getData() {
+		return data;
+	}
+
+	public void setData(DirectiveC0Data data) {
+		this.data = data;
+	}
+}
-package com.bsth.vehicle.directive.entity;
-
-/**
- * 
- * @ClassName: DispatchInstruct
- * @Description: TODO(调度指令类型)
- * @author PanZhao
- * @date 2016年6月7日 下午2:15:10
- *
- */
-public enum DispatchInstruct {
-	/**
-	 * 信息短语
-	 */
-	PHRASE((byte) 0x00),
-	
-	/**
-	 * 取消上次指令+调度指令(闹钟有效)
-	 */
-	CANCEL_AND_CLOCK_ON((byte) 0x01),
-	
-	/**
-	 * 调度指令(闹钟有效)
-	 */
-	DISPATCH_CLOCK_ON((byte) 0x02),
-	
-	/**
-	 * 运营状态指令(闹钟无效)
-	 */
-	OPERATE_CLOCK_OFF((byte) 0x03),
-	
-	/**
-	 * 其他
-	 */
-	OTHER((byte) 0x04);
-
-	private final byte value;
-
-	DispatchInstruct(byte value) {
-		this.value = value;
-	}
-
-	public byte getValue() {
-		return value;
-	}
-}
@@ -3,9 +3,9 @@ package com.bsth.vehicle.directive.repository;
 import org.springframework.stereotype.Repository;
 import com.bsth.repository.BaseRepository;
-import com.bsth.vehicle.directive.entity.Directive;
+import com.bsth.vehicle.directive.entity.Directive60;
 @Repository
-public interface DirectiveRepository extends BaseRepository<Directive, Integer>{
+public interface Directive60Repository extends BaseRepository<Directive60, Integer>{
 }
+package com.bsth.vehicle.directive.repository;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.data.jpa.repository.EntityGraph;
+import org.springframework.stereotype.Repository;
+
+import com.bsth.repository.BaseRepository;
+import com.bsth.vehicle.directive.entity.Directive80;
+
+@Repository
+public interface Directive80Repository extends BaseRepository<Directive80, Integer>{
+
+	@EntityGraph(value = "directive80_c0", type = EntityGraph.EntityGraphType.FETCH)
+    @Override
+    Page<Directive80> findAll(Specification<Directive80> spec, Pageable pageable);
+}
@@ -3,9 +3,9 @@ package com.bsth.vehicle.directive.repository;
 import org.springframework.stereotype.Repository;
 import com.bsth.repository.BaseRepository;
-import com.bsth.vehicle.directive.entity.DriverReport;
+import com.bsth.vehicle.directive.entity.DirectiveC0;
 @Repository
-public interface DriverReportRepository extends BaseRepository<DriverReport, Integer>{
+public interface DirectiveC0Repository extends BaseRepository<DirectiveC0, Integer>{
 }
@@ -3,9 +3,9 @@ package com.bsth.vehicle.directive.service;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.BaseService;
-import com.bsth.vehicle.directive.entity.Directive;
+import com.bsth.vehicle.directive.entity.Directive60;
-public interface DirectiveService extends BaseService<Directive, Integer>{
+public interface DirectiveService extends BaseService<Directive60, Integer>{
 	/**
 	 * 
@@ -28,6 +28,15 @@ public interface DirectiveService extends BaseService&lt;Directive, Integer&gt;{
 	 */
 	int send60Dispatch(ScheduleRealInfo sch, int finish);
+	/**
+	 * 
+	 * @Title: send60Dispatch 
+	 * @Description: TODO(调度指令下发) 
+	 * @param @param id 班次ID
+	 * @throws
+	 */
+	int send60Dispatch(Long id);
+	
 	//60营运指令
 	int send60Operation(String nbbm, int state, int upDown);
@@ -40,4 +49,14 @@ public interface DirectiveService extends BaseService&lt;Directive, Integer&gt;{
 	 * @throws
 	 */
 	int lineChange(String nbbm, Integer lineId);
+	
+	/**
+	 * 
+	 * @Title: upDownChange 
+	 * @Description: TODO(切换上下行) 
+	 * @param @param nbbm 车辆内部编码
+	 * @param @param upDonw 上下行 0 上行  1 下行
+	 * @throws
+	 */
+	int upDownChange(String nbbm, Integer upDown);
 }
 package com.bsth.vehicle.directive.service;
-import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,27 +14,29 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.realcontrol.buffer.ScheduleBuffer;
 import com.bsth.vehicle.common.CommonMapped;
 import com.bsth.vehicle.directive.Consts;
 import com.bsth.vehicle.directive.MsgIdGenerator;
 import com.bsth.vehicle.directive.buffer.DirectiveBuffer;
-import com.bsth.vehicle.directive.entity.Directive;
-import com.bsth.vehicle.directive.entity.Directive.DirectiveData;
-import com.bsth.vehicle.directive.entity.DispatchInstruct;
+import com.bsth.vehicle.directive.entity.Directive60;
+import com.bsth.vehicle.directive.entity.Directive60.DirectiveData;
 import com.bsth.vehicle.directive.entity.LineChange;
 import com.bsth.vehicle.directive.entity.LineChange.LineChangeData;
-import com.bsth.vehicle.directive.repository.DirectiveRepository;
+import com.bsth.vehicle.directive.repository.Directive60Repository;
 import com.bsth.vehicle.directive.repository.LineChangeRepository;
+import com.bsth.vehicle.directive.util.HttpUtils;
 import com.bsth.vehicle.gpsdata.buffer.GpsRealDataBuffer;
 import com.bsth.vehicle.gpsdata.entity.GpsRealData;
+import com.bsth.websocket.handler.RealControlSocketHandler;
 @Service
-public class DirectiveServiceImpl extends BaseServiceImpl<Directive, Integer> implements DirectiveService{
+public class DirectiveServiceImpl extends BaseServiceImpl<Directive60, Integer> implements DirectiveService{
 	Logger logger = LoggerFactory.getLogger(this.getClass());
 	@Autowired
-	DirectiveRepository directiveRepository;
+	Directive60Repository directiveRepository;
 	@Autowired
 	GpsRealDataBuffer gpsRealDataBuffer;
@@ -47,15 +44,21 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive, Integer&gt; im
 	@Autowired
 	LineChangeRepository lineChangeRepository;
+	@Autowired
+	RealControlSocketHandler socketHandler;
+	
 	SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH点mm分");
-	static Long schDiff = 1000 * 60 * 6L;
+	static Long schDiff = 1000 * 60 * 30L;
+	
+	//城市代码
+	static final short cityCode = 22;
 	@Override
 	public int send60Phrase(String nbbm, String text) {
-		Directive directive = null;
+		Directive60 directive = null;
 		try {
-			directive = create60Data(nbbm, text, DispatchInstruct.PHRASE);
+			directive = create60Data(nbbm, text, (short)0x00, null);
 		} catch (Exception e) {
 			logger.error("发送消息短语出现异常", e);
 			return -1;
@@ -65,7 +68,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive, Integer&gt; im
 			return -1;
 		//发送指令
-		int code = postJson(JSON.toJSONString(directive));
+		int code = HttpUtils.postJson(JSON.toJSONString(directive));
 		if(code == 0){
 			//添加到缓存，等待入库
@@ -78,18 +81,18 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive, Integer&gt; im
 	@Override
 	public int send60Dispatch(ScheduleRealInfo sch,  int finish) {
-		Directive directive = null;
+		Directive60 directive = null;
 		try {
 			//如果发车时间距当前时间较远，则不发送
-			if(Math.abs(sch.getFcsjT() - System.currentTimeMillis()) > schDiff){
+			/*if(Math.abs(sch.getFcsjT() - System.currentTimeMillis()) > schDiff){
 				return 0;
-			}
+			}*/
 			String text = "已完成" + finish + "个班次，下一发车时间" + sdfHHmm.format(new Date(sch.getFcsjT()))
 					+ "，由" + sch.getQdzName() + "发往" + sch.getZdzName();
 			//目前使用短语协议下发调度指令
-			directive = create60Data(sch.getClZbh(), text, DispatchInstruct.PHRASE);
+			directive = create60Data(sch.getClZbh(), text, (short)0x00, sch);
 		} catch (Exception e) {
 			logger.error("生成调度指令时出现异常", e);
 			return -1;
@@ -99,7 +102,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive, Integer&gt; im
 			return -1;
 		//发送指令
-		int code = postJson(JSON.toJSONString(directive));
+		int code = HttpUtils.postJson(JSON.toJSONString(directive));
 		if(code == 0){
 			sch.setDirectiveState(60);
@@ -107,12 +110,37 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive, Integer&gt; im
 			directive.setDispatch(true);
 			directive.setSch(sch);
 			DirectiveBuffer.put(directive);
+			
+			//通知页面，消息已发出
+			sendDirectiveState(sch);
 		}else{
 			logger.error("send60Phrase error, code: " + code);
 		}
 		return code;
 	}
+	
+	/**
+	 * 
+	 * @Title: sendDirectiveState 
+	 * @Description: TODO(向页面推送班次指令状态) 
+	 * @throws
+	 */
+	public void sendDirectiveState(ScheduleRealInfo sch){
+		JSONObject json = new JSONObject();
+		json.put("fn", "directive");
+		json.put("t", sch);
+		socketHandler.sendMessageToLine(Integer.parseInt(sch.getXlBm()), json.toJSONString());
+	}
+	
+	@Override
+	public int send60Dispatch(Long id) {
+		ScheduleRealInfo sch = ScheduleBuffer.findOne(id);
+		//车辆已完成班次
+		int finish = ScheduleBuffer.getFinishSchNo(sch.getClZbh());
+		return send60Dispatch(sch, finish);
+	}
+	
 	@Override
 	public int send60Operation(String nbbm, int state, int upDown) {
 		return 0;
@@ -128,8 +156,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive, Integer&gt; im
 		LineChange change = new LineChange();
 		LineChangeData data = new LineChangeData();
-		//暂时写死，没什么用
-		data.setCityCode((short) 22);
+		data.setCityCode(cityCode);
 		data.setDeviceId(deviceId);
 		data.setLineId(String.valueOf(lineId));
@@ -138,11 +165,13 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive, Integer&gt; im
 		change.setTimestamp(t);
 		change.setData(data);
-		int code = postJson(JSON.toJSONString(change));
+		int code = HttpUtils.postJson(JSON.toJSONString(change));
 		if(code == 0){
 			//入库
 			lineChangeRepository.save(change);
 			DirectiveBuffer.changeMap.put(deviceId + '_'  + t , change);
+			//通知设备刷新线路文件，忽略结果
+			HttpUtils.postJson(createDeviceRefreshData(deviceId, lineId));
 		}else{
 			logger.error("send60Phrase error, code: " + code);
 		}
@@ -150,28 +179,39 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive, Integer&gt; im
 	}
-	public Directive create60Data(String nbbm, String text, DispatchInstruct dispatchInstruct){
+	public Directive60 create60Data(String nbbm, String text, Short dispatchInstruct, ScheduleRealInfo sch){
 		Long timestamp = System.currentTimeMillis();
-		//向测试设备发送
+		/*//向测试设备发送
 		String deviceId = "ABCDFEGH";
-		Short company = 5;
+		Short company = 5;*/
-		/*String deviceId = CommonMapped.vehicDeviceBiMap.inverse().get(nbbm);
+		String deviceId = CommonMapped.vehicDeviceBiMap.inverse().get(nbbm);
 		Short company = Short.parseShort(CommonMapped.vehicCompanyMap.get(nbbm));
 		if(null == deviceId){
 			logger.error("没有设备号对照的车辆：" + nbbm);
 			return null;
-		}*/
-		GpsRealData gpsData = gpsRealDataBuffer.findOneByDeviceId(deviceId);
-		if(null == gpsData){
-			logger.error("没有找到gps对照，无法确认营运状态和上下行：" + nbbm);
-			return null;
+		}
+		//上下行和营运状态
+		Integer upDown = null, state = null;
+		if(null == sch){
+			GpsRealData gpsData = gpsRealDataBuffer.findOneByDeviceId(deviceId);
+			if(null == gpsData){
+				logger.error("没有找到gps对照，无法确认营运状态和上下行：" + nbbm);
+				return null;
+			}
+			upDown = gpsData.getUpDown();
+			state = gpsData.getState();
+		}
+		else{
+			upDown = Integer.parseInt(sch.getXlDir());
+			state = 0;
 		}
+		
 		int msgId = MsgIdGenerator.getMsgId();
-		Directive directive = new Directive();
+		Directive60 directive = new Directive60();
 		DirectiveData data = new DirectiveData();
 		//一级协议
 		directive.setOperCode((short) 0x60);
@@ -189,7 +229,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive, Integer&gt; im
 		directive.setData(data);
 		long serviceState;
 		try{
-			serviceState = Consts.SERVICE_STATE[gpsData.getUpDown()][gpsData.getState()];
+			serviceState = Consts.SERVICE_STATE[upDown][state];
 		}catch(IndexOutOfBoundsException e){
 			//未知营运状态的直接默认为上行非营运
 			serviceState = Consts.SERVICE_STATE[0][1];
@@ -200,33 +240,76 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive, Integer&gt; im
 		return directive;
 	}
-	public int postJson(String jsonStr){
-		CloseableHttpClient httpClient = null;
-		int code = -1;
+	@Override
+	public int upDownChange(String nbbm, Integer upDown) {
+		//构造数据
+		String deviceId = CommonMapped.vehicDeviceBiMap.inverse().get(nbbm);
+		Short company = Short.parseShort(CommonMapped.vehicCompanyMap.get(nbbm));
+		Long timestamp = System.currentTimeMillis();
+		int msgId = MsgIdGenerator.getMsgId();
+		Directive60 directive = new Directive60();
+		DirectiveData data = new DirectiveData();
+		//一级协议
+		directive.setOperCode((short) 0x60);
+		//设备号
+		directive.setDeviceId(deviceId);
+		//时间戳
+		directive.setTimestamp(timestamp);
+		directive.setMsgId(msgId);
+		//构造数据
+		data.setDeviceId(deviceId);
+		data.setDispatchInstruct((short)0x03);
+		data.setTimestamp(timestamp);
+		data.setCompanyCode(company);
+		data.setMsgId(msgId);
+		data.setTxtContent(nbbm + "_" + upDown);
+		directive.setData(data);
+		
+		long serviceState;
 		try{
-			httpClient = HttpClients.createDefault();
-			
-			HttpPost post = new HttpPost(Consts.SEND_DIRECTIVE_URL);
-			
-			post.setEntity(new StringEntity(jsonStr, "utf-8"));
+			serviceState = Consts.SERVICE_STATE[upDown][0];
+		}catch(IndexOutOfBoundsException e){
+			logger.error("upDonw: " + upDown, e);
+			return -1;
+		}
+		data.setServiceState(serviceState);
-			CloseableHttpResponse response = httpClient.execute(post);
-			
-			JSONObject json = JSONObject.parseObject(EntityUtils.toString(response.getEntity()));
-			if(null != json && json.getInteger("errCode") == 0)
-				code = 0;
-			else
-				logger.error("和网关http通讯失败，rs: " + json);
-		}catch(Exception e){
-			logger.error("", e);
-		}finally {
-			try {
-				if(httpClient != null)
-					httpClient.close();
-			} catch (IOException e) {
-				logger.error("", e);
-			}
+		int code = HttpUtils.postJson(JSON.toJSONString(directive));
+		if(code == 0){
+			//添加到缓存，等待入库
+			DirectiveBuffer.put(directive);
+		}else{
+			logger.error("send60 upDownChange error, code: " + code);
 		}
-		return code;
+		return 0;
+	}
+	
+	/**
+	 * 
+	 * @Title: createDeviceRefreshData 
+	 * @Description: TODO(生成设备线路刷新数据包) 
+	 * @param @return    设定文件 
+	 * @return String    返回类型 
+	 * @throws
+	 */
+	public String createDeviceRefreshData(String deviceId, Integer lineId){
+		Long t =  System.currentTimeMillis();
+		Map<String, Object> param = new HashMap<String, Object>();
+		param.put("deviceId", deviceId);
+		param.put("timestamp", t);
+		param.put("operCode", 0Xc0);
+		
+		Map<String, Object> data = new HashMap<String, Object>();
+		data.put("operCode", 0xa1);
+		data.put("cityCode", cityCode);
+		data.put("deviceId", deviceId);
+		data.put("timestamp", t);
+		data.put("centerId", 1);
+		data.put("lineId", lineId);
+		data.put("lineVersion", 0);
+		data.put("carparkDataVersion", 0);
+		param.put("data", data);
+		
+		return JSON.toJSONString(param);
 	}
 }
-package com.bsth.vehicle.directive;
+package com.bsth.vehicle.directive.thread;
 import java.util.LinkedList;
@@ -8,8 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import com.bsth.vehicle.directive.buffer.DirectiveBuffer;
-import com.bsth.vehicle.directive.entity.Directive;
-import com.bsth.vehicle.directive.repository.DirectiveRepository;
+import com.bsth.vehicle.directive.entity.Directive60;
+import com.bsth.vehicle.directive.repository.Directive60Repository;
 /**
  * 
@@ -23,15 +23,15 @@ import com.bsth.vehicle.directive.repository.DirectiveRepository;
 public class DirectivePersistenceThread extends Thread{
 	@Autowired
-	DirectiveRepository directiveRepository;
+	Directive60Repository directiveRepository;
 	Logger logger = LoggerFactory.getLogger(this.getClass());
 	@Override
 	public void run() {
-		LinkedList<Directive> list = DirectiveBuffer.transientList;
+		LinkedList<Directive60> list = DirectiveBuffer.transientList;
-		Directive directive;
+		Directive60 directive;
 		for(int i = 0; i < 1000; i ++){
 			directive = list.poll();
-package com.bsth.vehicle.directive;
+package com.bsth.vehicle.directive.thread;
 import java.util.LinkedList;
 import java.util.Set;
+package com.bsth.vehicle.directive.thread;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.bsth.entity.realcontrol.DeviceRevertLine;
+import com.bsth.repository.realcontrol.DeviceRevertLineRepository;
+import com.bsth.vehicle.directive.service.DirectiveService;
+
+/**
+ * 
+ * @ClassName: DeviceRevertLineThread 
+ * @Description: TODO(设备线路还原线程， 将借出的车还原到原线路) 
+ * @author PanZhao
+ * @date 2016年7月7日 上午11:30:38 
+ *
+ */
+@Component
+public class RevertLineThread extends Thread{
+	
+	@Autowired
+	DeviceRevertLineRepository deviceRevertLineRepository;
+	
+	@Autowired
+	DirectiveService directiveService;
+	
+	@Override
+	public void run() {
+		Long et = System.currentTimeMillis()
+			,st = et - (1000 * 60 * 5);
+		
+		List<DeviceRevertLine> list = deviceRevertLineRepository.findByDateAndStatus(st, et, 0);
+		
+		if(list.size() == 0)
+			return;
+		
+		int code;
+		for(DeviceRevertLine revertLine : list){
+			//还车
+			code = directiveService.lineChange(revertLine.getNbbm(), Integer.parseInt(revertLine.getRevertLine()));
+			
+			if(code == 0){
+				//改变状态
+				revertLine.setStatus(1);
+				deviceRevertLineRepository.save(revertLine);
+			}
+		}
+	}
+}
+package com.bsth.vehicle.directive.util;
+
+import java.io.IOException;
+
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.vehicle.directive.Consts;
+
+/**
+ * 
+ * @ClassName: HttpUtils 
+ * @Description: TODO(和网关HTTP通讯工具类) 
+ * @author PanZhao
+ * @date 2016年7月8日 上午10:38:10 
+ *
+ */
+public class HttpUtils {
+
+	static Logger logger = LoggerFactory.getLogger(HttpUtils.class);
+	
+	public static  int postJson(String jsonStr){
+		logger.info("send : " + jsonStr);
+		
+		CloseableHttpClient httpClient = null;
+		int code = -1;
+		try{
+			httpClient = HttpClients.createDefault();
+			
+			HttpPost post = new HttpPost(Consts.SEND_DIRECTIVE_URL);
+			
+			post.setEntity(new StringEntity(jsonStr, "utf-8"));
+		
+			CloseableHttpResponse response = httpClient.execute(post);
+			
+			JSONObject json = JSONObject.parseObject(EntityUtils.toString(response.getEntity()));
+			if(null != json && json.getInteger("errCode") == 0)
+				code = 0;
+			else
+				logger.error("和网关http通讯失败，rs: " + json);
+		}catch(Exception e){
+			logger.error("", e);
+		}finally {
+			try {
+				if(httpClient != null)
+					httpClient.close();
+			} catch (IOException e) {
+				logger.error("", e);
+			}
+		}
+		return code;
+	}
+}
@@ -7,6 +7,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -16,6 +17,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import com.alibaba.fastjson.JSONObject;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.realcontrol.buffer.ScheduleBuffer;
 import com.bsth.util.DateUtils;
@@ -23,6 +25,7 @@ import com.bsth.util.db.DBUtils_MS;
 import com.bsth.vehicle.directive.service.DirectiveService;
 import com.bsth.vehicle.gpsdata.buffer.GpsArrivalDataBuffer;
 import com.bsth.vehicle.gpsdata.entity.ArrivalInfo;
+import com.bsth.websocket.handler.RealControlSocketHandler;
 /**
  * 
@@ -41,6 +44,9 @@ public class GpsArrivalStationThread extends Thread{
 	@Autowired
 	DirectiveService directiveService;
+	@Autowired
+	RealControlSocketHandler socketHandler;
+	
 	private static int diff = 1000 * 60 * 20;
 	@Override
@@ -93,7 +99,7 @@ public class GpsArrivalStationThread extends Thread{
 			//匹配起点
 			matchStart(scInfo, arr);
-			//计划终点
+			//匹配终点
 			matchEnd(scInfo, arr);
 		}catch(Exception e){
 			e.printStackTrace();
@@ -123,10 +129,26 @@ public class GpsArrivalStationThread extends Thread{
 			//班次状态改为正在执行
 			scInfo.setStatus(1);
 			ScheduleBuffer.persistentList.add(scInfo);
+			//推送到页面
+			sendFcsj(scInfo);
 		}
 	}
 	/**
+	 * @Title: sendFcsj 
+	 * @Description: TODO(推送发车信息) 
+	 * @param @param schedule    班次
+	 * @throws
+	 */
+	public void sendFcsj(ScheduleRealInfo schedule){
+		JSONObject json = new JSONObject();
+		json.put("fn", "faChe");
+		json.put("t", schedule);
+		json.put("dataStr", sdf.format(new Date()));
+		socketHandler.sendMessageToLine(Integer.parseInt(schedule.getXlBm()), json.toJSONString());
+	}
+	
+	/**
 	 * 
 	 * @Title: matchEnd 
 	 * @Description: TODO(匹配终点 进站时间) 
@@ -148,11 +170,31 @@ public class GpsArrivalStationThread extends Thread{
 			//完成当前班次
 			ScheduleRealInfo nextSch = ScheduleBuffer.finishSch(scInfo);
 			//到达终点，发送下一班次的调度指令
-			directiveService.send60Dispatch(nextSch, ScheduleBuffer.getFinishSchNo(nextSch.getClZbh()));
+			int finish = ScheduleBuffer.getFinishSchNo(nextSch.getClZbh());
+			directiveService.send60Dispatch(nextSch, finish);
+			//推送到页面
+			sendZdsj(scInfo, nextSch, finish);
 		}
 	}
 	/**
+	 * @Title: sendFcsj 
+	 * @Description: TODO(推送到达终点时间) 
+	 * @param @param schedule    班次
+	 * @throws
+	 */
+	public void sendZdsj(ScheduleRealInfo schedule,ScheduleRealInfo nextSch, int finish){
+		JSONObject json = new JSONObject();
+		json.put("fn", "zhongDian");
+		json.put("t", schedule);
+		json.put("nt", nextSch);
+		json.put("finish", finish);
+		json.put("dataStr", sdf.format(new Date()));
+		
+		socketHandler.sendMessageToLine(Integer.parseInt(schedule.getXlBm()), json.toJSONString());
+	}
+	
+	/**
 	 * @throws ParseException 
 	 * 
 	 * @Title: loadData 
@@ -170,7 +212,7 @@ public class GpsArrivalStationThread extends Thread{
 			GpsArrivalDataBuffer.markTime = DateUtils.getTimesmorning() * 1000L;
 		}
-		String sql = "select * from bsth_c_arrival_info where weeks_year=? and create_date > ?";
+		String sql = "select * from bsth_c_arrival_info where weeks_year=? and create_date > ? order by ts";
 		List<ArrivalInfo> list = new ArrayList<>();
 		Connection conn = null;
@@ -179,8 +221,8 @@ public class GpsArrivalStationThread extends Thread{
 		try {
 			conn = DBUtils_MS.getConnection();
 			ps = conn.prepareStatement(sql);
-			ps.setInt(1, weeks_year);
-			ps.setLong(2, /*GpsArrivalDataBuffer.markTime*/1467099600000L);
+			ps.setInt(1, /*weeks_year*/28);
+			ps.setLong(2, /*GpsArrivalDataBuffer.markTime*/1467853749000L);
 			Long t = System.currentTimeMillis();
 			rs = ps.executeQuery();
@@ -215,7 +257,7 @@ public class GpsArrivalStationThread extends Thread{
 		Long t = System.currentTimeMillis();
 		for(ScheduleRealInfo sch : allList){
 			if(Math.abs(sch.getFcsjT() - t) < rang
-					|| Math.abs(sch.getZdsjT()) - t < rang){
+					|| (sch.getZdsjT() != null && Math.abs(sch.getZdsjT()) - t < rang)){
 				subList.add(sch);
 			}
 		}
@@ -55,6 +55,10 @@ public class GpsRealDataBuffer {
 		return deviceGpsMap == null;
 	}
+	static{
+		lineGpsMultimap = ArrayListMultimap.create();
+	}
+	
 	/**
 	 * 
 	 * @Title: initBuffer 
+package com.bsth.websocket;
+
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
+import org.springframework.http.server.ServerHttpRequest;
+import org.springframework.http.server.ServerHttpResponse;
+import org.springframework.http.server.ServletServerHttpRequest;
+import org.springframework.stereotype.Component;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.server.HandshakeInterceptor;
+
+import com.bsth.common.Constants;
+
+@Component
+public class WebSocketHandshakeInterceptor implements HandshakeInterceptor {
+
+	@Override
+	public void afterHandshake(ServerHttpRequest request,
+			ServerHttpResponse arg1, WebSocketHandler arg2, Exception arg3) {
+	}
+
+	@Override
+	public boolean beforeHandshake(ServerHttpRequest request,
+			ServerHttpResponse arg1, WebSocketHandler arg2,
+			Map<String, Object> attributes) throws Exception {
+		if (request instanceof ServletServerHttpRequest) {
+			ServletServerHttpRequest servletRequest = (ServletServerHttpRequest) request;
+			HttpSession session = servletRequest.getServletRequest()
+					.getSession(false);
+			if (session != null) {
+				// 使用SESSION_USERNAME区分WebSocketHandler，以便定向发送消息
+				String userName = session.getAttribute(Constants.SESSION_USERNAME).toString();
+				attributes.put(Constants.SESSION_USERNAME, userName);
+			}
+		}
+		return true;
+	}
+}
+package com.bsth.websocket.handler;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Set;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketMessage;
+import org.springframework.web.socket.WebSocketSession;
+
+import com.bsth.common.Constants;
+import com.bsth.vehicle.common.CommonMapped;
+
+/**
+ * 驾驶员上报80指令推送
+ * 注意：在sendMsg时，多线程状态下有几率出现连接状态脏读，建议 synchronized
+ * @author PanZhao
+ */
+@Component
+public class RealControlSocketHandler implements WebSocketHandler {
+
+	private static final ArrayList<WebSocketSession> users;
+
+	static {
+		users = new ArrayList<WebSocketSession>();
+	}
+	
+	@Override
+	public void afterConnectionClosed(WebSocketSession session, CloseStatus arg1)
+			throws Exception {
+        users.remove(session);
+	}
+
+	@Override
+	public void afterConnectionEstablished(WebSocketSession session)
+			throws Exception {
+		users.add(session);
+	}
+
+	@Override
+	public void handleMessage(WebSocketSession arg0, WebSocketMessage<?> arg1)
+			throws Exception {
+	}
+
+	@Override
+	public void handleTransportError(WebSocketSession session, Throwable arg1)
+			throws Exception {
+		if(session.isOpen()){
+            session.close();
+        }
+        users.remove(session);
+	}
+
+	@Override
+	public boolean supportsPartialMessages() {
+		return false;
+	}
+
+	/**
+	 * 给所有在线用户发送消息
+	 *
+	 * @param message
+	 */
+	public synchronized void sendMessageToUsers(TextMessage message) {
+		for (WebSocketSession user : users) {
+			try {
+				if (user.isOpen()) {
+					user.sendMessage(message);
+				}
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+	}
+
+	/**
+	 * 给某些用户发送消息
+	 *
+	 * @param userId
+	 * @param message
+	 */
+	public synchronized void sendMessageToUser(Set<String> uids, String msg) {
+		TextMessage message = new TextMessage(msg.getBytes());
+		for (WebSocketSession user : users) {
+			if (uids.contains(user.getAttributes().get(Constants.SESSION_USERNAME))) {
+				try {
+					if (user.isOpen()) {
+						user.sendMessage(message);
+					}
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+	
+	/**
+	 * 根据线路推送消息
+	 *
+	 * @param userId
+	 * @param message
+	 */
+	public synchronized void sendMessageToLine(Integer lineCode, String msg) {
+		Set<String> uids = CommonMapped.lineUserMap.get(lineCode);
+		if(null == uids || uids.size() == 0)
+			return;
+		
+		TextMessage message = new TextMessage(msg.getBytes());
+		for (WebSocketSession user : users) {
+			if (uids.contains(user.getAttributes().get(Constants.SESSION_USERNAME))) {
+				try {
+					if (user.isOpen()) {
+						user.sendMessage(message);
+					}
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+}
@@ -19,6 +19,12 @@ spring.datasource.max-idle=8
 spring.datasource.min-idle=8
 spring.datasource.initial-size=5
+spring.datasource.test-on-borrow=true
+spring.datasource.test-on-connect=true
+spring.datasource.test-on-return=true
+spring.datasource.test-while-idle=true
+spring.datasource.validation-query=select 1
+
 spring.view.suffix=.html
 server.session-timeout=-1
@@ -11,7 +11,7 @@ var fs = require(&#39;fs&#39;)
 	,crypto = require("crypto");
 //不参与的目录
-var excludes = ['scheduleApp']
+var excludes = ['scheduleApp', 'trafficManage']
 	,ep = new EventProxy()
 	,pName = 'bsth_control'
 	,path = process.cwd()
+#ftp.url=222.66.0.205
+#ftp.port=21
+#ftp.username=transport
+#ftp.password=transport123
+#ftp.path= down/
+
+ftp.url=192.168.168.101
+ftp.port=21
+ftp.username=testftpservice
+ftp.password= 123
+ftp.path= ftptest/
 \ No newline at end of file
@@ -21,20 +21,26 @@ function removeConfirm(text, url, success) {
 function successHandle(json, handle){
-	if(!json.status){
+	var status = json.status;
+	if(status == 407){
+		alert('被注销的登录');
+		return;
+	}
+	
+	if(!status){
 		handle && handle(json);
 		return ;
 	}
-	if(json.status == 'ERROR')
-		layer.alert(json.msg, {icon: 2, title: '操作失败'});    
+	if(status == 'ERROR')
+		layer.alert(json.msg?json.msg:'未知异常', {icon: 2, title: '操作失败'});    
 	else
 		handle && handle(json);
 }
 function ajaxComplete(xhr, ts, succ){
 	if(ts == 'success'){
-		successHandle(xhr.responseJSON, succ);
+		successHandle(JSON.parse(xhr.responseText), succ);
 	}
 	else if(ts == 'error'){
 		layer.alert(xhr.responseText, {icon: 2, title: '操作失败'});
@@ -139,4 +145,49 @@ function createTreeData(arr){
 		}
 	}
 	return treeData;
+}
+
+
+function createVehSearch($e){
+	//车辆内部编码下拉搜索框
+	$e.select2({
+		placeholder: '搜索车辆...',
+		ajax: {
+			url: '/realSchedule/sreachVehic',
+			dataType: 'json',
+			delay: 150,
+			data: function(params){
+				return{nbbm: params.term};
+			},
+		    processResults: function (data) {
+		      return {
+		        results: data
+		      };
+		    },
+			cache: true
+		},
+		templateResult: function(repo){
+			if (repo.loading) return repo.text;
+			var h = '<span>'+repo.text+'</span>';
+			h += (repo.lineName?'&nbsp;<span class="select2-desc">'+repo.lineName+'</span>':'');
+			return h;
+		},
+		escapeMarkup: function (markup) { return markup; },
+		minimumInputLength: 1,
+		templateSelection: function(repo){
+			return repo.text;
+		},
+		language: {
+	       noResults: function(){
+	           return '<span style="color:red;font-size: 12px;">没有搜索到车辆！</span>';
+	       },
+	       inputTooShort : function(e) {
+				return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入自编号搜索车辆</span>';
+		   },
+	       searching : function() {
+				return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>';
+		   }
+		}
+	})
+	return $e;
 }
 \ No newline at end of file
+/* sockjs-client v1.1.1 | http://sockjs.org | MIT license */
+!function(t){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{var e;"undefined"!=typeof window?e=window:"undefined"!=typeof global?e=global:"undefined"!=typeof self&&(e=self),e.SockJS=t()}}(function(){var t;return function e(t,n,r){function i(s,a){if(!n[s]){if(!t[s]){var u="function"==typeof require&&require;if(!a&&u)return u(s,!0);if(o)return o(s,!0);var l=new Error("Cannot find module '"+s+"'");throw l.code="MODULE_NOT_FOUND",l}var c=n[s]={exports:{}};t[s][0].call(c.exports,function(e){var n=t[s][1][e];return i(n?n:e)},c,c.exports,e,t,n,r)}return n[s].exports}for(var o="function"==typeof require&&require,s=0;s<r.length;s++)i(r[s]);return i}({1:[function(t,e){(function(n){"use strict";var r=t("./transport-list");e.exports=t("./main")(r),"_sockjs_onload"in n&&setTimeout(n._sockjs_onload,1)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./main":14,"./transport-list":16}],2:[function(t,e){"use strict";function n(){i.call(this),this.initEvent("close",!1,!1),this.wasClean=!1,this.code=0,this.reason=""}var r=t("inherits"),i=t("./event");r(n,i),e.exports=n},{"./event":4,inherits:54}],3:[function(t,e){"use strict";function n(){i.call(this)}var r=t("inherits"),i=t("./eventtarget");r(n,i),n.prototype.removeAllListeners=function(t){t?delete this._listeners[t]:this._listeners={}},n.prototype.once=function(t,e){function n(){r.removeListener(t,n),i||(i=!0,e.apply(this,arguments))}var r=this,i=!1;this.on(t,n)},n.prototype.emit=function(){var t=arguments[0],e=this._listeners[t];if(e){for(var n=arguments.length,r=new Array(n-1),i=1;n>i;i++)r[i-1]=arguments[i];for(var o=0;o<e.length;o++)e[o].apply(this,r)}},n.prototype.on=n.prototype.addListener=i.prototype.addEventListener,n.prototype.removeListener=i.prototype.removeEventListener,e.exports.EventEmitter=n},{"./eventtarget":5,inherits:54}],4:[function(t,e){"use strict";function n(t){this.type=t}n.prototype.initEvent=function(t,e,n){return this.type=t,this.bubbles=e,this.cancelable=n,this.timeStamp=+new Date,this},n.prototype.stopPropagation=function(){},n.prototype.preventDefault=function(){},n.CAPTURING_PHASE=1,n.AT_TARGET=2,n.BUBBLING_PHASE=3,e.exports=n},{}],5:[function(t,e){"use strict";function n(){this._listeners={}}n.prototype.addEventListener=function(t,e){t in this._listeners||(this._listeners[t]=[]);var n=this._listeners[t];-1===n.indexOf(e)&&(n=n.concat([e])),this._listeners[t]=n},n.prototype.removeEventListener=function(t,e){var n=this._listeners[t];if(n){var r=n.indexOf(e);return-1!==r?void(n.length>1?this._listeners[t]=n.slice(0,r).concat(n.slice(r+1)):delete this._listeners[t]):void 0}},n.prototype.dispatchEvent=function(){var t=arguments[0],e=t.type,n=1===arguments.length?[t]:Array.apply(null,arguments);if(this["on"+e]&&this["on"+e].apply(this,n),e in this._listeners)for(var r=this._listeners[e],i=0;i<r.length;i++)r[i].apply(this,n)},e.exports=n},{}],6:[function(t,e){"use strict";function n(t){i.call(this),this.initEvent("message",!1,!1),this.data=t}var r=t("inherits"),i=t("./event");r(n,i),e.exports=n},{"./event":4,inherits:54}],7:[function(t,e){"use strict";function n(t){this._transport=t,t.on("message",this._transportMessage.bind(this)),t.on("close",this._transportClose.bind(this))}var r=t("json3"),i=t("./utils/iframe");n.prototype._transportClose=function(t,e){i.postMessage("c",r.stringify([t,e]))},n.prototype._transportMessage=function(t){i.postMessage("t",t)},n.prototype._send=function(t){this._transport.send(t)},n.prototype._close=function(){this._transport.close(),this._transport.removeAllListeners()},e.exports=n},{"./utils/iframe":47,json3:55}],8:[function(t,e){"use strict";var n=t("./utils/url"),r=t("./utils/event"),i=t("json3"),o=t("./facade"),s=t("./info-iframe-receiver"),a=t("./utils/iframe"),u=t("./location");e.exports=function(t,e){var l={};e.forEach(function(t){t.facadeTransport&&(l[t.facadeTransport.transportName]=t.facadeTransport)}),l[s.transportName]=s;var c;t.bootstrap_iframe=function(){var e;a.currentWindowId=u.hash.slice(1);var s=function(r){if(r.source===parent&&("undefined"==typeof c&&(c=r.origin),r.origin===c)){var s;try{s=i.parse(r.data)}catch(f){return}if(s.windowId===a.currentWindowId)switch(s.type){case"s":var h;try{h=i.parse(s.data)}catch(f){break}var d=h[0],p=h[1],v=h[2],m=h[3];if(d!==t.version)throw new Error('Incompatible SockJS! Main site uses: "'+d+'", the iframe: "'+t.version+'".');if(!n.isOriginEqual(v,u.href)||!n.isOriginEqual(m,u.href))throw new Error("Can't connect to different domain from within an iframe. ("+u.href+", "+v+", "+m+")");e=new o(new l[p](v,m));break;case"m":e._send(s.data);break;case"c":e&&e._close(),e=null}}};r.attachEvent("message",s),a.postMessage("s")}}},{"./facade":7,"./info-iframe-receiver":10,"./location":13,"./utils/event":46,"./utils/iframe":47,"./utils/url":52,debug:void 0,json3:55}],9:[function(t,e){"use strict";function n(t,e){r.call(this);var n=this,i=+new Date;this.xo=new e("GET",t),this.xo.once("finish",function(t,e){var r,a;if(200===t){if(a=+new Date-i,e)try{r=o.parse(e)}catch(u){}s.isObject(r)||(r={})}n.emit("finish",r,a),n.removeAllListeners()})}var r=t("events").EventEmitter,i=t("inherits"),o=t("json3"),s=t("./utils/object");i(n,r),n.prototype.close=function(){this.removeAllListeners(),this.xo.close()},e.exports=n},{"./utils/object":49,debug:void 0,events:3,inherits:54,json3:55}],10:[function(t,e){"use strict";function n(t){var e=this;i.call(this),this.ir=new a(t,s),this.ir.once("finish",function(t,n){e.ir=null,e.emit("message",o.stringify([t,n]))})}var r=t("inherits"),i=t("events").EventEmitter,o=t("json3"),s=t("./transport/sender/xhr-local"),a=t("./info-ajax");r(n,i),n.transportName="iframe-info-receiver",n.prototype.close=function(){this.ir&&(this.ir.close(),this.ir=null),this.removeAllListeners()},e.exports=n},{"./info-ajax":9,"./transport/sender/xhr-local":37,events:3,inherits:54,json3:55}],11:[function(t,e){(function(n){"use strict";function r(t,e){var r=this;i.call(this);var o=function(){var n=r.ifr=new u(l.transportName,e,t);n.once("message",function(t){if(t){var e;try{e=s.parse(t)}catch(n){return r.emit("finish"),void r.close()}var i=e[0],o=e[1];r.emit("finish",i,o)}r.close()}),n.once("close",function(){r.emit("finish"),r.close()})};n.document.body?o():a.attachEvent("load",o)}var i=t("events").EventEmitter,o=t("inherits"),s=t("json3"),a=t("./utils/event"),u=t("./transport/iframe"),l=t("./info-iframe-receiver");o(r,i),r.enabled=function(){return u.enabled()},r.prototype.close=function(){this.ifr&&this.ifr.close(),this.removeAllListeners(),this.ifr=null},e.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./info-iframe-receiver":10,"./transport/iframe":22,"./utils/event":46,debug:void 0,events:3,inherits:54,json3:55}],12:[function(t,e){"use strict";function n(t,e){var n=this;r.call(this),setTimeout(function(){n.doXhr(t,e)},0)}var r=t("events").EventEmitter,i=t("inherits"),o=t("./utils/url"),s=t("./transport/sender/xdr"),a=t("./transport/sender/xhr-cors"),u=t("./transport/sender/xhr-local"),l=t("./transport/sender/xhr-fake"),c=t("./info-iframe"),f=t("./info-ajax");i(n,r),n._getReceiver=function(t,e,n){return n.sameOrigin?new f(e,u):a.enabled?new f(e,a):s.enabled&&n.sameScheme?new f(e,s):c.enabled()?new c(t,e):new f(e,l)},n.prototype.doXhr=function(t,e){var r=this,i=o.addPath(t,"/info");this.xo=n._getReceiver(t,i,e),this.timeoutRef=setTimeout(function(){r._cleanup(!1),r.emit("finish")},n.timeout),this.xo.once("finish",function(t,e){r._cleanup(!0),r.emit("finish",t,e)})},n.prototype._cleanup=function(t){clearTimeout(this.timeoutRef),this.timeoutRef=null,!t&&this.xo&&this.xo.close(),this.xo=null},n.prototype.close=function(){this.removeAllListeners(),this._cleanup(!1)},n.timeout=8e3,e.exports=n},{"./info-ajax":9,"./info-iframe":11,"./transport/sender/xdr":34,"./transport/sender/xhr-cors":35,"./transport/sender/xhr-fake":36,"./transport/sender/xhr-local":37,"./utils/url":52,debug:void 0,events:3,inherits:54}],13:[function(t,e){(function(t){"use strict";e.exports=t.location||{origin:"http://localhost:80",protocol:"http",host:"localhost",port:80,href:"http://localhost/",hash:""}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],14:[function(t,e){(function(n){"use strict";function r(t,e,n){if(!(this instanceof r))return new r(t,e,n);if(arguments.length<1)throw new TypeError("Failed to construct 'SockJS: 1 argument required, but only 0 present");b.call(this),this.readyState=r.CONNECTING,this.extensions="",this.protocol="",n=n||{},n.protocols_whitelist&&m.warn("'protocols_whitelist' is DEPRECATED. Use 'transports' instead."),this._transportsWhitelist=n.transports,this._transportOptions=n.transportOptions||{};var i=n.sessionId||8;if("function"==typeof i)this._generateSessionId=i;else{if("number"!=typeof i)throw new TypeError("If sessionId is used in the options, it needs to be a number or a function.");this._generateSessionId=function(){return l.string(i)}}this._server=n.server||l.numberString(1e3);var o=new s(t);if(!o.host||!o.protocol)throw new SyntaxError("The URL '"+t+"' is invalid");if(o.hash)throw new SyntaxError("The URL must not contain a fragment");if("http:"!==o.protocol&&"https:"!==o.protocol)throw new SyntaxError("The URL's scheme must be either 'http:' or 'https:'. '"+o.protocol+"' is not allowed.");var a="https:"===o.protocol;if("https"===g.protocol&&!a)throw new Error("SecurityError: An insecure SockJS connection may not be initiated from a page loaded over HTTPS");e?Array.isArray(e)||(e=[e]):e=[];var u=e.sort();u.forEach(function(t,e){if(!t)throw new SyntaxError("The protocols entry '"+t+"' is invalid.");if(e<u.length-1&&t===u[e+1])throw new SyntaxError("The protocols entry '"+t+"' is duplicated.")});var c=f.getOrigin(g.href);this._origin=c?c.toLowerCase():null,o.set("pathname",o.pathname.replace(/\/+$/,"")),this.url=o.href,this._urlInfo={nullOrigin:!v.hasDomain(),sameOrigin:f.isOriginEqual(this.url,g.href),sameScheme:f.isSchemeEqual(this.url,g.href)},this._ir=new _(this.url,this._urlInfo),this._ir.once("finish",this._receiveInfo.bind(this))}function i(t){return 1e3===t||t>=3e3&&4999>=t}t("./shims");var o,s=t("url-parse"),a=t("inherits"),u=t("json3"),l=t("./utils/random"),c=t("./utils/escape"),f=t("./utils/url"),h=t("./utils/event"),d=t("./utils/transport"),p=t("./utils/object"),v=t("./utils/browser"),m=t("./utils/log"),y=t("./event/event"),b=t("./event/eventtarget"),g=t("./location"),w=t("./event/close"),x=t("./event/trans-message"),_=t("./info-receiver");a(r,b),r.prototype.close=function(t,e){if(t&&!i(t))throw new Error("InvalidAccessError: Invalid code");if(e&&e.length>123)throw new SyntaxError("reason argument has an invalid length");if(this.readyState!==r.CLOSING&&this.readyState!==r.CLOSED){var n=!0;this._close(t||1e3,e||"Normal closure",n)}},r.prototype.send=function(t){if("string"!=typeof t&&(t=""+t),this.readyState===r.CONNECTING)throw new Error("InvalidStateError: The connection has not been established yet");this.readyState===r.OPEN&&this._transport.send(c.quote(t))},r.version=t("./version"),r.CONNECTING=0,r.OPEN=1,r.CLOSING=2,r.CLOSED=3,r.prototype._receiveInfo=function(t,e){if(this._ir=null,!t)return void this._close(1002,"Cannot connect to server");this._rto=this.countRTO(e),this._transUrl=t.base_url?t.base_url:this.url,t=p.extend(t,this._urlInfo);var n=o.filterToEnabled(this._transportsWhitelist,t);this._transports=n.main,this._connect()},r.prototype._connect=function(){for(var t=this._transports.shift();t;t=this._transports.shift()){if(t.needBody&&(!n.document.body||"undefined"!=typeof n.document.readyState&&"complete"!==n.document.readyState&&"interactive"!==n.document.readyState))return this._transports.unshift(t),void h.attachEvent("load",this._connect.bind(this));var e=this._rto*t.roundTrips||5e3;this._transportTimeoutId=setTimeout(this._transportTimeout.bind(this),e);var r=f.addPath(this._transUrl,"/"+this._server+"/"+this._generateSessionId()),i=this._transportOptions[t.transportName],o=new t(r,this._transUrl,i);return o.on("message",this._transportMessage.bind(this)),o.once("close",this._transportClose.bind(this)),o.transportName=t.transportName,void(this._transport=o)}this._close(2e3,"All transports failed",!1)},r.prototype._transportTimeout=function(){this.readyState===r.CONNECTING&&this._transportClose(2007,"Transport timed out")},r.prototype._transportMessage=function(t){var e,n=this,r=t.slice(0,1),i=t.slice(1);switch(r){case"o":return void this._open();case"h":return void this.dispatchEvent(new y("heartbeat"))}if(i)try{e=u.parse(i)}catch(o){}if("undefined"!=typeof e)switch(r){case"a":Array.isArray(e)&&e.forEach(function(t){n.dispatchEvent(new x(t))});break;case"m":this.dispatchEvent(new x(e));break;case"c":Array.isArray(e)&&2===e.length&&this._close(e[0],e[1],!0)}},r.prototype._transportClose=function(t,e){return this._transport&&(this._transport.removeAllListeners(),this._transport=null,this.transport=null),i(t)||2e3===t||this.readyState!==r.CONNECTING?void this._close(t,e):void this._connect()},r.prototype._open=function(){this.readyState===r.CONNECTING?(this._transportTimeoutId&&(clearTimeout(this._transportTimeoutId),this._transportTimeoutId=null),this.readyState=r.OPEN,this.transport=this._transport.transportName,this.dispatchEvent(new y("open"))):this._close(1006,"Server lost session")},r.prototype._close=function(t,e,n){var i=!1;if(this._ir&&(i=!0,this._ir.close(),this._ir=null),this._transport&&(this._transport.close(),this._transport=null,this.transport=null),this.readyState===r.CLOSED)throw new Error("InvalidStateError: SockJS has already been closed");this.readyState=r.CLOSING,setTimeout(function(){this.readyState=r.CLOSED,i&&this.dispatchEvent(new y("error"));var o=new w("close");o.wasClean=n||!1,o.code=t||1e3,o.reason=e,this.dispatchEvent(o),this.onmessage=this.onclose=this.onerror=null}.bind(this),0)},r.prototype.countRTO=function(t){return t>100?4*t:300+t},e.exports=function(e){return o=d(e),t("./iframe-bootstrap")(r,e),r}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./event/close":2,"./event/event":4,"./event/eventtarget":5,"./event/trans-message":6,"./iframe-bootstrap":8,"./info-receiver":12,"./location":13,"./shims":15,"./utils/browser":44,"./utils/escape":45,"./utils/event":46,"./utils/log":48,"./utils/object":49,"./utils/random":50,"./utils/transport":51,"./utils/url":52,"./version":53,debug:void 0,inherits:54,json3:55,"url-parse":56}],15:[function(){"use strict";function t(t){var e=+t;return e!==e?e=0:0!==e&&e!==1/0&&e!==-(1/0)&&(e=(e>0||-1)*Math.floor(Math.abs(e))),e}function e(t){return t>>>0}function n(){}var r,i=Array.prototype,o=Object.prototype,s=Function.prototype,a=String.prototype,u=i.slice,l=o.toString,c=function(t){return"[object Function]"===o.toString.call(t)},f=function(t){return"[object Array]"===l.call(t)},h=function(t){return"[object String]"===l.call(t)},d=Object.defineProperty&&function(){try{return Object.defineProperty({},"x",{}),!0}catch(t){return!1}}();r=d?function(t,e,n,r){!r&&e in t||Object.defineProperty(t,e,{configurable:!0,enumerable:!1,writable:!0,value:n})}:function(t,e,n,r){!r&&e in t||(t[e]=n)};var p=function(t,e,n){for(var i in e)o.hasOwnProperty.call(e,i)&&r(t,i,e[i],n)},v=function(t){if(null==t)throw new TypeError("can't convert "+t+" to object");return Object(t)};p(s,{bind:function(t){var e=this;if(!c(e))throw new TypeError("Function.prototype.bind called on incompatible "+e);for(var r=u.call(arguments,1),i=function(){if(this instanceof l){var n=e.apply(this,r.concat(u.call(arguments)));return Object(n)===n?n:this}return e.apply(t,r.concat(u.call(arguments)))},o=Math.max(0,e.length-r.length),s=[],a=0;o>a;a++)s.push("$"+a);var l=Function("binder","return function ("+s.join(",")+"){ return binder.apply(this, arguments); }")(i);return e.prototype&&(n.prototype=e.prototype,l.prototype=new n,n.prototype=null),l}}),p(Array,{isArray:f});var m=Object("a"),y="a"!==m[0]||!(0 in m),b=function(t){var e=!0,n=!0;return t&&(t.call("foo",function(t,n,r){"object"!=typeof r&&(e=!1)}),t.call([1],function(){n="string"==typeof this},"x")),!!t&&e&&n};p(i,{forEach:function(t){var e=v(this),n=y&&h(this)?this.split(""):e,r=arguments[1],i=-1,o=n.length>>>0;if(!c(t))throw new TypeError;for(;++i<o;)i in n&&t.call(r,n[i],i,e)}},!b(i.forEach));var g=Array.prototype.indexOf&&-1!==[0,1].indexOf(1,2);p(i,{indexOf:function(e){var n=y&&h(this)?this.split(""):v(this),r=n.length>>>0;if(!r)return-1;var i=0;for(arguments.length>1&&(i=t(arguments[1])),i=i>=0?i:Math.max(0,r+i);r>i;i++)if(i in n&&n[i]===e)return i;return-1}},g);var w=a.split;2!=="ab".split(/(?:ab)*/).length||4!==".".split(/(.?)(.?)/).length||"t"==="tesst".split(/(s)*/)[1]||4!=="test".split(/(?:)/,-1).length||"".split(/.?/).length||".".split(/()()/).length>1?!function(){var t=void 0===/()??/.exec("")[1];a.split=function(n,r){var o=this;if(void 0===n&&0===r)return[];if("[object RegExp]"!==l.call(n))return w.call(this,n,r);var s,a,u,c,f=[],h=(n.ignoreCase?"i":"")+(n.multiline?"m":"")+(n.extended?"x":"")+(n.sticky?"y":""),d=0;for(n=new RegExp(n.source,h+"g"),o+="",t||(s=new RegExp("^"+n.source+"$(?!\\s)",h)),r=void 0===r?-1>>>0:e(r);(a=n.exec(o))&&(u=a.index+a[0].length,!(u>d&&(f.push(o.slice(d,a.index)),!t&&a.length>1&&a[0].replace(s,function(){for(var t=1;t<arguments.length-2;t++)void 0===arguments[t]&&(a[t]=void 0)}),a.length>1&&a.index<o.length&&i.push.apply(f,a.slice(1)),c=a[0].length,d=u,f.length>=r)));)n.lastIndex===a.index&&n.lastIndex++;return d===o.length?(c||!n.test(""))&&f.push(""):f.push(o.slice(d)),f.length>r?f.slice(0,r):f}}():"0".split(void 0,0).length&&(a.split=function(t,e){return void 0===t&&0===e?[]:w.call(this,t,e)});var x="	\n\f\r   ᠎             　\u2028\u2029",_="",E="["+x+"]",j=new RegExp("^"+E+E+"*"),T=new RegExp(E+E+"*$"),S=a.trim&&(x.trim()||!_.trim());p(a,{trim:function(){if(void 0===this||null===this)throw new TypeError("can't convert "+this+" to object");return String(this).replace(j,"").replace(T,"")}},S);var O=a.substr,C="".substr&&"b"!=="0b".substr(-1);p(a,{substr:function(t,e){return O.call(this,0>t&&(t=this.length+t)<0?0:t,e)}},C)},{}],16:[function(t,e){"use strict";e.exports=[t("./transport/websocket"),t("./transport/xhr-streaming"),t("./transport/xdr-streaming"),t("./transport/eventsource"),t("./transport/lib/iframe-wrap")(t("./transport/eventsource")),t("./transport/htmlfile"),t("./transport/lib/iframe-wrap")(t("./transport/htmlfile")),t("./transport/xhr-polling"),t("./transport/xdr-polling"),t("./transport/lib/iframe-wrap")(t("./transport/xhr-polling")),t("./transport/jsonp-polling")]},{"./transport/eventsource":20,"./transport/htmlfile":21,"./transport/jsonp-polling":23,"./transport/lib/iframe-wrap":26,"./transport/websocket":38,"./transport/xdr-polling":39,"./transport/xdr-streaming":40,"./transport/xhr-polling":41,"./transport/xhr-streaming":42}],17:[function(t,e){(function(n){"use strict";function r(t,e,n,r){var o=this;i.call(this),setTimeout(function(){o._start(t,e,n,r)},0)}var i=t("events").EventEmitter,o=t("inherits"),s=t("../../utils/event"),a=t("../../utils/url"),u=n.XMLHttpRequest;o(r,i),r.prototype._start=function(t,e,n,i){var o=this;try{this.xhr=new u}catch(l){}if(!this.xhr)return this.emit("finish",0,"no xhr support"),void this._cleanup();e=a.addQuery(e,"t="+ +new Date),this.unloadRef=s.unloadAdd(function(){o._cleanup(!0)});try{this.xhr.open(t,e,!0),this.timeout&&"timeout"in this.xhr&&(this.xhr.timeout=this.timeout,this.xhr.ontimeout=function(){o.emit("finish",0,""),o._cleanup(!1)})}catch(c){return this.emit("finish",0,""),void this._cleanup(!1)}if(i&&i.noCredentials||!r.supportsCORS||(this.xhr.withCredentials="true"),i&&i.headers)for(var f in i.headers)this.xhr.setRequestHeader(f,i.headers[f]);this.xhr.onreadystatechange=function(){if(o.xhr){var t,e,n=o.xhr;switch(n.readyState){case 3:try{e=n.status,t=n.responseText}catch(r){}1223===e&&(e=204),200===e&&t&&t.length>0&&o.emit("chunk",e,t);break;case 4:e=n.status,1223===e&&(e=204),(12005===e||12029===e)&&(e=0),o.emit("finish",e,n.responseText),o._cleanup(!1)}}};try{o.xhr.send(n)}catch(c){o.emit("finish",0,""),o._cleanup(!1)}},r.prototype._cleanup=function(t){if(this.xhr){if(this.removeAllListeners(),s.unloadDel(this.unloadRef),this.xhr.onreadystatechange=function(){},this.xhr.ontimeout&&(this.xhr.ontimeout=null),t)try{this.xhr.abort()}catch(e){}this.unloadRef=this.xhr=null}},r.prototype.close=function(){this._cleanup(!0)},r.enabled=!!u;var l=["Active"].concat("Object").join("X");!r.enabled&&l in n&&(u=function(){try{return new n[l]("Microsoft.XMLHTTP")}catch(t){return null}},r.enabled=!!new u);var c=!1;try{c="withCredentials"in new u}catch(f){}r.supportsCORS=c,e.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../../utils/event":46,"../../utils/url":52,debug:void 0,events:3,inherits:54}],18:[function(t,e){(function(t){e.exports=t.EventSource}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],19:[function(t,e){(function(t){"use strict";var n=t.WebSocket||t.MozWebSocket;n&&(e.exports=function(t){return new n(t)})}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],20:[function(t,e){"use strict";function n(t){if(!n.enabled())throw new Error("Transport created when disabled");i.call(this,t,"/eventsource",o,s)}var r=t("inherits"),i=t("./lib/ajax-based"),o=t("./receiver/eventsource"),s=t("./sender/xhr-cors"),a=t("eventsource");r(n,i),n.enabled=function(){return!!a},n.transportName="eventsource",n.roundTrips=2,e.exports=n},{"./lib/ajax-based":24,"./receiver/eventsource":29,"./sender/xhr-cors":35,eventsource:18,inherits:54}],21:[function(t,e){"use strict";function n(t){if(!i.enabled)throw new Error("Transport created when disabled");s.call(this,t,"/htmlfile",i,o)}var r=t("inherits"),i=t("./receiver/htmlfile"),o=t("./sender/xhr-local"),s=t("./lib/ajax-based");r(n,s),n.enabled=function(t){return i.enabled&&t.sameOrigin},n.transportName="htmlfile",n.roundTrips=2,e.exports=n},{"./lib/ajax-based":24,"./receiver/htmlfile":30,"./sender/xhr-local":37,inherits:54}],22:[function(t,e){"use strict";function n(t,e,r){if(!n.enabled())throw new Error("Transport created when disabled");o.call(this);var i=this;this.origin=a.getOrigin(r),this.baseUrl=r,this.transUrl=e,this.transport=t,this.windowId=c.string(8);var s=a.addPath(r,"/iframe.html")+"#"+this.windowId;this.iframeObj=u.createIframe(s,function(t){i.emit("close",1006,"Unable to load an iframe ("+t+")"),i.close()}),this.onmessageCallback=this._message.bind(this),l.attachEvent("message",this.onmessageCallback)}var r=t("inherits"),i=t("json3"),o=t("events").EventEmitter,s=t("../version"),a=t("../utils/url"),u=t("../utils/iframe"),l=t("../utils/event"),c=t("../utils/random");r(n,o),n.prototype.close=function(){if(this.removeAllListeners(),this.iframeObj){l.detachEvent("message",this.onmessageCallback);try{this.postMessage("c")}catch(t){}this.iframeObj.cleanup(),this.iframeObj=null,this.onmessageCallback=this.iframeObj=null}},n.prototype._message=function(t){if(a.isOriginEqual(t.origin,this.origin)){var e;try{e=i.parse(t.data)}catch(n){return}if(e.windowId===this.windowId)switch(e.type){case"s":this.iframeObj.loaded(),this.postMessage("s",i.stringify([s,this.transport,this.transUrl,this.baseUrl]));break;case"t":this.emit("message",e.data);break;case"c":var r;try{r=i.parse(e.data)}catch(n){return}this.emit("close",r[0],r[1]),this.close()}}},n.prototype.postMessage=function(t,e){this.iframeObj.post(i.stringify({windowId:this.windowId,type:t,data:e||""}),this.origin)},n.prototype.send=function(t){this.postMessage("m",t)},n.enabled=function(){return u.iframeEnabled},n.transportName="iframe",n.roundTrips=2,e.exports=n},{"../utils/event":46,"../utils/iframe":47,"../utils/random":50,"../utils/url":52,"../version":53,debug:void 0,events:3,inherits:54,json3:55}],23:[function(t,e){(function(n){"use strict";function r(t){if(!r.enabled())throw new Error("Transport created when disabled");o.call(this,t,"/jsonp",a,s)}var i=t("inherits"),o=t("./lib/sender-receiver"),s=t("./receiver/jsonp"),a=t("./sender/jsonp");i(r,o),r.enabled=function(){return!!n.document},r.transportName="jsonp-polling",r.roundTrips=1,r.needBody=!0,e.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./lib/sender-receiver":28,"./receiver/jsonp":31,"./sender/jsonp":33,inherits:54}],24:[function(t,e){"use strict";function n(t){return function(e,n,r){var i={};"string"==typeof n&&(i.headers={"Content-type":"text/plain"});var s=o.addPath(e,"/xhr_send"),a=new t("POST",s,n,i);return a.once("finish",function(t){return a=null,200!==t&&204!==t?r(new Error("http status "+t)):void r()}),function(){a.close(),a=null;var t=new Error("Aborted");t.code=1e3,r(t)}}}function r(t,e,r,i){s.call(this,t,e,n(i),r,i)}var i=t("inherits"),o=t("../../utils/url"),s=t("./sender-receiver");i(r,s),e.exports=r},{"../../utils/url":52,"./sender-receiver":28,debug:void 0,inherits:54}],25:[function(t,e){"use strict";function n(t,e){i.call(this),this.sendBuffer=[],this.sender=e,this.url=t}var r=t("inherits"),i=t("events").EventEmitter;r(n,i),n.prototype.send=function(t){this.sendBuffer.push(t),this.sendStop||this.sendSchedule()},n.prototype.sendScheduleWait=function(){var t,e=this;this.sendStop=function(){e.sendStop=null,clearTimeout(t)},t=setTimeout(function(){e.sendStop=null,e.sendSchedule()},25)},n.prototype.sendSchedule=function(){var t=this;if(this.sendBuffer.length>0){var e="["+this.sendBuffer.join(",")+"]";this.sendStop=this.sender(this.url,e,function(e){t.sendStop=null,e?(t.emit("close",e.code||1006,"Sending error: "+e),t._cleanup()):t.sendScheduleWait()}),this.sendBuffer=[]}},n.prototype._cleanup=function(){this.removeAllListeners()},n.prototype.stop=function(){this._cleanup(),this.sendStop&&(this.sendStop(),this.sendStop=null)},e.exports=n},{debug:void 0,events:3,inherits:54}],26:[function(t,e){(function(n){"use strict";var r=t("inherits"),i=t("../iframe"),o=t("../../utils/object");e.exports=function(t){function e(e,n){i.call(this,t.transportName,e,n)}return r(e,i),e.enabled=function(e,r){if(!n.document)return!1;var s=o.extend({},r);return s.sameOrigin=!0,t.enabled(s)&&i.enabled()},e.transportName="iframe-"+t.transportName,e.needBody=!0,e.roundTrips=i.roundTrips+t.roundTrips-1,e.facadeTransport=t,e}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../../utils/object":49,"../iframe":22,inherits:54}],27:[function(t,e){"use strict";function n(t,e,n){i.call(this),this.Receiver=t,this.receiveUrl=e,this.AjaxObject=n,this._scheduleReceiver()}var r=t("inherits"),i=t("events").EventEmitter;r(n,i),n.prototype._scheduleReceiver=function(){var t=this,e=this.poll=new this.Receiver(this.receiveUrl,this.AjaxObject);e.on("message",function(e){t.emit("message",e)}),e.once("close",function(n,r){t.poll=e=null,t.pollIsClosing||("network"===r?t._scheduleReceiver():(t.emit("close",n||1006,r),t.removeAllListeners()))})},n.prototype.abort=function(){this.removeAllListeners(),this.pollIsClosing=!0,this.poll&&this.poll.abort()},e.exports=n},{debug:void 0,events:3,inherits:54}],28:[function(t,e){"use strict";function n(t,e,n,r,a){var u=i.addPath(t,e),l=this;o.call(this,t,n),this.poll=new s(r,u,a),this.poll.on("message",function(t){l.emit("message",t)}),this.poll.once("close",function(t,e){l.poll=null,l.emit("close",t,e),l.close()})}var r=t("inherits"),i=t("../../utils/url"),o=t("./buffered-sender"),s=t("./polling");r(n,o),n.prototype.close=function(){this.removeAllListeners(),this.poll&&(this.poll.abort(),this.poll=null),this.stop()},e.exports=n},{"../../utils/url":52,"./buffered-sender":25,"./polling":27,debug:void 0,inherits:54}],29:[function(t,e){"use strict";function n(t){i.call(this);var e=this,n=this.es=new o(t);n.onmessage=function(t){e.emit("message",decodeURI(t.data))},n.onerror=function(t){var r=2!==n.readyState?"network":"permanent";e._cleanup(),e._close(r)}}var r=t("inherits"),i=t("events").EventEmitter,o=t("eventsource");r(n,i),n.prototype.abort=function(){this._cleanup(),this._close("user")},n.prototype._cleanup=function(){var t=this.es;t&&(t.onmessage=t.onerror=null,t.close(),this.es=null)},n.prototype._close=function(t){var e=this;setTimeout(function(){e.emit("close",null,t),e.removeAllListeners()},200)},e.exports=n},{debug:void 0,events:3,eventsource:18,inherits:54}],30:[function(t,e){(function(n){"use strict";function r(t){a.call(this);var e=this;o.polluteGlobalNamespace(),this.id="a"+u.string(6),t=s.addQuery(t,"c="+decodeURIComponent(o.WPrefix+"."+this.id));var i=r.htmlfileEnabled?o.createHtmlfile:o.createIframe;n[o.WPrefix][this.id]={start:function(){e.iframeObj.loaded()},message:function(t){e.emit("message",t)},stop:function(){e._cleanup(),e._close("network")}},this.iframeObj=i(t,function(){e._cleanup(),e._close("permanent")})}var i=t("inherits"),o=t("../../utils/iframe"),s=t("../../utils/url"),a=t("events").EventEmitter,u=t("../../utils/random");i(r,a),r.prototype.abort=function(){this._cleanup(),this._close("user")},r.prototype._cleanup=function(){this.iframeObj&&(this.iframeObj.cleanup(),this.iframeObj=null),delete n[o.WPrefix][this.id]},r.prototype._close=function(t){this.emit("close",null,t),this.removeAllListeners()},r.htmlfileEnabled=!1;var l=["Active"].concat("Object").join("X");if(l in n)try{r.htmlfileEnabled=!!new n[l]("htmlfile")}catch(c){}r.enabled=r.htmlfileEnabled||o.iframeEnabled,e.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../../utils/iframe":47,"../../utils/random":50,"../../utils/url":52,debug:void 0,events:3,inherits:54}],31:[function(t,e){(function(n){"use strict";function r(t){var e=this;l.call(this),i.polluteGlobalNamespace(),this.id="a"+o.string(6);var s=a.addQuery(t,"c="+encodeURIComponent(i.WPrefix+"."+this.id));n[i.WPrefix][this.id]=this._callback.bind(this),this._createScript(s),this.timeoutId=setTimeout(function(){e._abort(new Error("JSONP script loaded abnormally (timeout)"))},r.timeout)}var i=t("../../utils/iframe"),o=t("../../utils/random"),s=t("../../utils/browser"),a=t("../../utils/url"),u=t("inherits"),l=t("events").EventEmitter;u(r,l),r.prototype.abort=function(){if(n[i.WPrefix][this.id]){var t=new Error("JSONP user aborted read");t.code=1e3,this._abort(t)}},r.timeout=35e3,r.scriptErrorTimeout=1e3,r.prototype._callback=function(t){this._cleanup(),this.aborting||(t&&this.emit("message",t),this.emit("close",null,"network"),this.removeAllListeners())},r.prototype._abort=function(t){this._cleanup(),this.aborting=!0,this.emit("close",t.code,t.message),this.removeAllListeners()},r.prototype._cleanup=function(){if(clearTimeout(this.timeoutId),this.script2&&(this.script2.parentNode.removeChild(this.script2),this.script2=null),this.script){var t=this.script;t.parentNode.removeChild(t),t.onreadystatechange=t.onerror=t.onload=t.onclick=null,this.script=null}delete n[i.WPrefix][this.id]},r.prototype._scriptError=function(){var t=this;this.errorTimer||(this.errorTimer=setTimeout(function(){t.loadedOkay||t._abort(new Error("JSONP script loaded abnormally (onerror)"))},r.scriptErrorTimeout))},r.prototype._createScript=function(t){var e,r=this,i=this.script=n.document.createElement("script");if(i.id="a"+o.string(8),i.src=t,i.type="text/javascript",i.charset="UTF-8",i.onerror=this._scriptError.bind(this),i.onload=function(){r._abort(new Error("JSONP script loaded abnormally (onload)"))},i.onreadystatechange=function(){if(/loaded|closed/.test(i.readyState)){if(i&&i.htmlFor&&i.onclick){r.loadedOkay=!0;try{i.onclick()}catch(t){}}i&&r._abort(new Error("JSONP script loaded abnormally (onreadystatechange)"))
+}},"undefined"==typeof i.async&&n.document.attachEvent)if(s.isOpera())e=this.script2=n.document.createElement("script"),e.text="try{var a = document.getElementById('"+i.id+"'); if(a)a.onerror();}catch(x){};",i.async=e.async=!1;else{try{i.htmlFor=i.id,i.event="onclick"}catch(a){}i.async=!0}"undefined"!=typeof i.async&&(i.async=!0);var u=n.document.getElementsByTagName("head")[0];u.insertBefore(i,u.firstChild),e&&u.insertBefore(e,u.firstChild)},e.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../../utils/browser":44,"../../utils/iframe":47,"../../utils/random":50,"../../utils/url":52,debug:void 0,events:3,inherits:54}],32:[function(t,e){"use strict";function n(t,e){i.call(this);var n=this;this.bufferPosition=0,this.xo=new e("POST",t,null),this.xo.on("chunk",this._chunkHandler.bind(this)),this.xo.once("finish",function(t,e){n._chunkHandler(t,e),n.xo=null;var r=200===t?"network":"permanent";n.emit("close",null,r),n._cleanup()})}var r=t("inherits"),i=t("events").EventEmitter;r(n,i),n.prototype._chunkHandler=function(t,e){if(200===t&&e)for(var n=-1;;this.bufferPosition+=n+1){var r=e.slice(this.bufferPosition);if(n=r.indexOf("\n"),-1===n)break;var i=r.slice(0,n);i&&this.emit("message",i)}},n.prototype._cleanup=function(){this.removeAllListeners()},n.prototype.abort=function(){this.xo&&(this.xo.close(),this.emit("close",null,"user"),this.xo=null),this._cleanup()},e.exports=n},{debug:void 0,events:3,inherits:54}],33:[function(t,e){(function(n){"use strict";function r(t){try{return n.document.createElement('<iframe name="'+t+'">')}catch(e){var r=n.document.createElement("iframe");return r.name=t,r}}function i(){o=n.document.createElement("form"),o.style.display="none",o.style.position="absolute",o.method="POST",o.enctype="application/x-www-form-urlencoded",o.acceptCharset="UTF-8",s=n.document.createElement("textarea"),s.name="d",o.appendChild(s),n.document.body.appendChild(o)}var o,s,a=t("../../utils/random"),u=t("../../utils/url");e.exports=function(t,e,n){o||i();var l="a"+a.string(8);o.target=l,o.action=u.addQuery(u.addPath(t,"/jsonp_send"),"i="+l);var c=r(l);c.id=l,c.style.display="none",o.appendChild(c);try{s.value=e}catch(f){}o.submit();var h=function(t){c.onerror&&(c.onreadystatechange=c.onerror=c.onload=null,setTimeout(function(){c.parentNode.removeChild(c),c=null},500),s.value="",n(t))};return c.onerror=function(){h()},c.onload=function(){h()},c.onreadystatechange=function(t){"complete"===c.readyState&&h()},function(){h(new Error("Aborted"))}}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../../utils/random":50,"../../utils/url":52,debug:void 0}],34:[function(t,e){(function(n){"use strict";function r(t,e,n){var r=this;i.call(this),setTimeout(function(){r._start(t,e,n)},0)}var i=t("events").EventEmitter,o=t("inherits"),s=t("../../utils/event"),a=t("../../utils/browser"),u=t("../../utils/url");o(r,i),r.prototype._start=function(t,e,r){var i=this,o=new n.XDomainRequest;e=u.addQuery(e,"t="+ +new Date),o.onerror=function(){i._error()},o.ontimeout=function(){i._error()},o.onprogress=function(){i.emit("chunk",200,o.responseText)},o.onload=function(){i.emit("finish",200,o.responseText),i._cleanup(!1)},this.xdr=o,this.unloadRef=s.unloadAdd(function(){i._cleanup(!0)});try{this.xdr.open(t,e),this.timeout&&(this.xdr.timeout=this.timeout),this.xdr.send(r)}catch(a){this._error()}},r.prototype._error=function(){this.emit("finish",0,""),this._cleanup(!1)},r.prototype._cleanup=function(t){if(this.xdr){if(this.removeAllListeners(),s.unloadDel(this.unloadRef),this.xdr.ontimeout=this.xdr.onerror=this.xdr.onprogress=this.xdr.onload=null,t)try{this.xdr.abort()}catch(e){}this.unloadRef=this.xdr=null}},r.prototype.close=function(){this._cleanup(!0)},r.enabled=!(!n.XDomainRequest||!a.hasDomain()),e.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../../utils/browser":44,"../../utils/event":46,"../../utils/url":52,debug:void 0,events:3,inherits:54}],35:[function(t,e){"use strict";function n(t,e,n,r){i.call(this,t,e,n,r)}var r=t("inherits"),i=t("../driver/xhr");r(n,i),n.enabled=i.enabled&&i.supportsCORS,e.exports=n},{"../driver/xhr":17,inherits:54}],36:[function(t,e){"use strict";function n(){var t=this;r.call(this),this.to=setTimeout(function(){t.emit("finish",200,"{}")},n.timeout)}var r=t("events").EventEmitter,i=t("inherits");i(n,r),n.prototype.close=function(){clearTimeout(this.to)},n.timeout=2e3,e.exports=n},{events:3,inherits:54}],37:[function(t,e){"use strict";function n(t,e,n){i.call(this,t,e,n,{noCredentials:!0})}var r=t("inherits"),i=t("../driver/xhr");r(n,i),n.enabled=i.enabled,e.exports=n},{"../driver/xhr":17,inherits:54}],38:[function(t,e){"use strict";function n(t,e,o){if(!n.enabled())throw new Error("Transport created when disabled");s.call(this);var u=this,l=i.addPath(t,"/websocket");l="https"===l.slice(0,5)?"wss"+l.slice(5):"ws"+l.slice(4),this.url=l,this.ws=new a(this.url,[],o),this.ws.onmessage=function(t){u.emit("message",t.data)},this.unloadRef=r.unloadAdd(function(){u.ws.close()}),this.ws.onclose=function(t){u.emit("close",t.code,t.reason),u._cleanup()},this.ws.onerror=function(t){u.emit("close",1006,"WebSocket connection broken"),u._cleanup()}}var r=t("../utils/event"),i=t("../utils/url"),o=t("inherits"),s=t("events").EventEmitter,a=t("./driver/websocket");o(n,s),n.prototype.send=function(t){var e="["+t+"]";this.ws.send(e)},n.prototype.close=function(){this.ws&&this.ws.close(),this._cleanup()},n.prototype._cleanup=function(){var t=this.ws;t&&(t.onmessage=t.onclose=t.onerror=null),r.unloadDel(this.unloadRef),this.unloadRef=this.ws=null,this.removeAllListeners()},n.enabled=function(){return!!a},n.transportName="websocket",n.roundTrips=2,e.exports=n},{"../utils/event":46,"../utils/url":52,"./driver/websocket":19,debug:void 0,events:3,inherits:54}],39:[function(t,e){"use strict";function n(t){if(!a.enabled)throw new Error("Transport created when disabled");i.call(this,t,"/xhr",s,a)}var r=t("inherits"),i=t("./lib/ajax-based"),o=t("./xdr-streaming"),s=t("./receiver/xhr"),a=t("./sender/xdr");r(n,i),n.enabled=o.enabled,n.transportName="xdr-polling",n.roundTrips=2,e.exports=n},{"./lib/ajax-based":24,"./receiver/xhr":32,"./sender/xdr":34,"./xdr-streaming":40,inherits:54}],40:[function(t,e){"use strict";function n(t){if(!s.enabled)throw new Error("Transport created when disabled");i.call(this,t,"/xhr_streaming",o,s)}var r=t("inherits"),i=t("./lib/ajax-based"),o=t("./receiver/xhr"),s=t("./sender/xdr");r(n,i),n.enabled=function(t){return t.cookie_needed||t.nullOrigin?!1:s.enabled&&t.sameScheme},n.transportName="xdr-streaming",n.roundTrips=2,e.exports=n},{"./lib/ajax-based":24,"./receiver/xhr":32,"./sender/xdr":34,inherits:54}],41:[function(t,e){"use strict";function n(t){if(!a.enabled&&!s.enabled)throw new Error("Transport created when disabled");i.call(this,t,"/xhr",o,s)}var r=t("inherits"),i=t("./lib/ajax-based"),o=t("./receiver/xhr"),s=t("./sender/xhr-cors"),a=t("./sender/xhr-local");r(n,i),n.enabled=function(t){return t.nullOrigin?!1:a.enabled&&t.sameOrigin?!0:s.enabled},n.transportName="xhr-polling",n.roundTrips=2,e.exports=n},{"./lib/ajax-based":24,"./receiver/xhr":32,"./sender/xhr-cors":35,"./sender/xhr-local":37,inherits:54}],42:[function(t,e){(function(n){"use strict";function r(t){if(!u.enabled&&!a.enabled)throw new Error("Transport created when disabled");o.call(this,t,"/xhr_streaming",s,a)}var i=t("inherits"),o=t("./lib/ajax-based"),s=t("./receiver/xhr"),a=t("./sender/xhr-cors"),u=t("./sender/xhr-local"),l=t("../utils/browser");i(r,o),r.enabled=function(t){return t.nullOrigin?!1:l.isOpera()?!1:a.enabled},r.transportName="xhr-streaming",r.roundTrips=2,r.needBody=!!n.document,e.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../utils/browser":44,"./lib/ajax-based":24,"./receiver/xhr":32,"./sender/xhr-cors":35,"./sender/xhr-local":37,inherits:54}],43:[function(t,e){(function(t){"use strict";e.exports.randomBytes=t.crypto&&t.crypto.getRandomValues?function(e){var n=new Uint8Array(e);return t.crypto.getRandomValues(n),n}:function(t){for(var e=new Array(t),n=0;t>n;n++)e[n]=Math.floor(256*Math.random());return e}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],44:[function(t,e){(function(t){"use strict";e.exports={isOpera:function(){return t.navigator&&/opera/i.test(t.navigator.userAgent)},isKonqueror:function(){return t.navigator&&/konqueror/i.test(t.navigator.userAgent)},hasDomain:function(){if(!t.document)return!0;try{return!!t.document.domain}catch(e){return!1}}}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],45:[function(t,e){"use strict";var n,r=t("json3"),i=/[\x00-\x1f\ud800-\udfff\ufffe\uffff\u0300-\u0333\u033d-\u0346\u034a-\u034c\u0350-\u0352\u0357-\u0358\u035c-\u0362\u0374\u037e\u0387\u0591-\u05af\u05c4\u0610-\u0617\u0653-\u0654\u0657-\u065b\u065d-\u065e\u06df-\u06e2\u06eb-\u06ec\u0730\u0732-\u0733\u0735-\u0736\u073a\u073d\u073f-\u0741\u0743\u0745\u0747\u07eb-\u07f1\u0951\u0958-\u095f\u09dc-\u09dd\u09df\u0a33\u0a36\u0a59-\u0a5b\u0a5e\u0b5c-\u0b5d\u0e38-\u0e39\u0f43\u0f4d\u0f52\u0f57\u0f5c\u0f69\u0f72-\u0f76\u0f78\u0f80-\u0f83\u0f93\u0f9d\u0fa2\u0fa7\u0fac\u0fb9\u1939-\u193a\u1a17\u1b6b\u1cda-\u1cdb\u1dc0-\u1dcf\u1dfc\u1dfe\u1f71\u1f73\u1f75\u1f77\u1f79\u1f7b\u1f7d\u1fbb\u1fbe\u1fc9\u1fcb\u1fd3\u1fdb\u1fe3\u1feb\u1fee-\u1fef\u1ff9\u1ffb\u1ffd\u2000-\u2001\u20d0-\u20d1\u20d4-\u20d7\u20e7-\u20e9\u2126\u212a-\u212b\u2329-\u232a\u2adc\u302b-\u302c\uaab2-\uaab3\uf900-\ufa0d\ufa10\ufa12\ufa15-\ufa1e\ufa20\ufa22\ufa25-\ufa26\ufa2a-\ufa2d\ufa30-\ufa6d\ufa70-\ufad9\ufb1d\ufb1f\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40-\ufb41\ufb43-\ufb44\ufb46-\ufb4e\ufff0-\uffff]/g,o=function(t){var e,n={},r=[];for(e=0;65536>e;e++)r.push(String.fromCharCode(e));return t.lastIndex=0,r.join("").replace(t,function(t){return n[t]="\\u"+("0000"+t.charCodeAt(0).toString(16)).slice(-4),""}),t.lastIndex=0,n};e.exports={quote:function(t){var e=r.stringify(t);return i.lastIndex=0,i.test(e)?(n||(n=o(i)),e.replace(i,function(t){return n[t]})):e}}},{json3:55}],46:[function(t,e){(function(n){"use strict";var r=t("./random"),i={},o=!1,s=n.chrome&&n.chrome.app&&n.chrome.app.runtime;e.exports={attachEvent:function(t,e){"undefined"!=typeof n.addEventListener?n.addEventListener(t,e,!1):n.document&&n.attachEvent&&(n.document.attachEvent("on"+t,e),n.attachEvent("on"+t,e))},detachEvent:function(t,e){"undefined"!=typeof n.addEventListener?n.removeEventListener(t,e,!1):n.document&&n.detachEvent&&(n.document.detachEvent("on"+t,e),n.detachEvent("on"+t,e))},unloadAdd:function(t){if(s)return null;var e=r.string(8);return i[e]=t,o&&setTimeout(this.triggerUnloadCallbacks,0),e},unloadDel:function(t){t in i&&delete i[t]},triggerUnloadCallbacks:function(){for(var t in i)i[t](),delete i[t]}};var a=function(){o||(o=!0,e.exports.triggerUnloadCallbacks())};s||e.exports.attachEvent("unload",a)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./random":50}],47:[function(t,e){(function(n){"use strict";var r=t("./event"),i=t("json3"),o=t("./browser");e.exports={WPrefix:"_jp",currentWindowId:null,polluteGlobalNamespace:function(){e.exports.WPrefix in n||(n[e.exports.WPrefix]={})},postMessage:function(t,r){n.parent!==n&&n.parent.postMessage(i.stringify({windowId:e.exports.currentWindowId,type:t,data:r||""}),"*")},createIframe:function(t,e){var i,o,s=n.document.createElement("iframe"),a=function(){clearTimeout(i);try{s.onload=null}catch(t){}s.onerror=null},u=function(){s&&(a(),setTimeout(function(){s&&s.parentNode.removeChild(s),s=null},0),r.unloadDel(o))},l=function(t){s&&(u(),e(t))},c=function(t,e){try{setTimeout(function(){s&&s.contentWindow&&s.contentWindow.postMessage(t,e)},0)}catch(n){}};return s.src=t,s.style.display="none",s.style.position="absolute",s.onerror=function(){l("onerror")},s.onload=function(){clearTimeout(i),i=setTimeout(function(){l("onload timeout")},2e3)},n.document.body.appendChild(s),i=setTimeout(function(){l("timeout")},15e3),o=r.unloadAdd(u),{post:c,cleanup:u,loaded:a}},createHtmlfile:function(t,i){var o,s,a,u=["Active"].concat("Object").join("X"),l=new n[u]("htmlfile"),c=function(){clearTimeout(o),a.onerror=null},f=function(){l&&(c(),r.unloadDel(s),a.parentNode.removeChild(a),a=l=null,CollectGarbage())},h=function(t){l&&(f(),i(t))},d=function(t,e){try{setTimeout(function(){a&&a.contentWindow&&a.contentWindow.postMessage(t,e)},0)}catch(n){}};l.open(),l.write('<html><script>document.domain="'+n.document.domain+'";</script></html>'),l.close(),l.parentWindow[e.exports.WPrefix]=n[e.exports.WPrefix];var p=l.createElement("div");return l.body.appendChild(p),a=l.createElement("iframe"),p.appendChild(a),a.src=t,a.onerror=function(){h("onerror")},o=setTimeout(function(){h("timeout")},15e3),s=r.unloadAdd(f),{post:d,cleanup:f,loaded:c}}},e.exports.iframeEnabled=!1,n.document&&(e.exports.iframeEnabled=("function"==typeof n.postMessage||"object"==typeof n.postMessage)&&!o.isKonqueror())}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./browser":44,"./event":46,debug:void 0,json3:55}],48:[function(t,e){(function(t){"use strict";var n={};["log","debug","warn"].forEach(function(e){var r;try{r=t.console&&t.console[e]&&t.console[e].apply}catch(i){}n[e]=r?function(){return t.console[e].apply(t.console,arguments)}:"log"===e?function(){}:n.log}),e.exports=n}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],49:[function(t,e){"use strict";e.exports={isObject:function(t){var e=typeof t;return"function"===e||"object"===e&&!!t},extend:function(t){if(!this.isObject(t))return t;for(var e,n,r=1,i=arguments.length;i>r;r++){e=arguments[r];for(n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n])}return t}}},{}],50:[function(t,e){"use strict";var n=t("crypto"),r="abcdefghijklmnopqrstuvwxyz012345";e.exports={string:function(t){for(var e=r.length,i=n.randomBytes(t),o=[],s=0;t>s;s++)o.push(r.substr(i[s]%e,1));return o.join("")},number:function(t){return Math.floor(Math.random()*t)},numberString:function(t){var e=(""+(t-1)).length,n=new Array(e+1).join("0");return(n+this.number(t)).slice(-e)}}},{crypto:43}],51:[function(t,e){"use strict";e.exports=function(t){return{filterToEnabled:function(e,n){var r={main:[],facade:[]};return e?"string"==typeof e&&(e=[e]):e=[],t.forEach(function(t){t&&("websocket"!==t.transportName||n.websocket!==!1)&&(e.length&&-1===e.indexOf(t.transportName)||t.enabled(n)&&(r.main.push(t),t.facadeTransport&&r.facade.push(t.facadeTransport)))}),r}}}},{debug:void 0}],52:[function(t,e){"use strict";var n=t("url-parse");e.exports={getOrigin:function(t){if(!t)return null;var e=new n(t);if("file:"===e.protocol)return null;var r=e.port;return r||(r="https:"===e.protocol?"443":"80"),e.protocol+"//"+e.hostname+":"+r},isOriginEqual:function(t,e){var n=this.getOrigin(t)===this.getOrigin(e);return n},isSchemeEqual:function(t,e){return t.split(":")[0]===e.split(":")[0]},addPath:function(t,e){var n=t.split("?");return n[0]+e+(n[1]?"?"+n[1]:"")},addQuery:function(t,e){return t+(-1===t.indexOf("?")?"?"+e:"&"+e)}}},{debug:void 0,"url-parse":56}],53:[function(t,e){e.exports="1.1.1"},{}],54:[function(t,e){e.exports="function"==typeof Object.create?function(t,e){t.super_=e,t.prototype=Object.create(e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}})}:function(t,e){t.super_=e;var n=function(){};n.prototype=e.prototype,t.prototype=new n,t.prototype.constructor=t}},{}],55:[function(e,n,r){(function(e){(function(){function i(t,e){function n(t){if(n[t]!==m)return n[t];var i;if("bug-string-char-index"==t)i="a"!="a"[0];else if("json"==t)i=n("json-stringify")&&n("json-parse");else{var s,a='{"a":[1,true,false,null,"\\u0000\\b\\n\\f\\r\\t"]}';if("json-stringify"==t){var u=e.stringify,c="function"==typeof u&&g;if(c){(s=function(){return 1}).toJSON=s;try{c="0"===u(0)&&"0"===u(new r)&&'""'==u(new o)&&u(b)===m&&u(m)===m&&u()===m&&"1"===u(s)&&"[1]"==u([s])&&"[null]"==u([m])&&"null"==u(null)&&"[null,null,null]"==u([m,b,null])&&u({a:[s,!0,!1,null,"\x00\b\n\f\r	"]})==a&&"1"===u(null,s)&&"[\n 1,\n 2\n]"==u([1,2],null,1)&&'"-271821-04-20T00:00:00.000Z"'==u(new l(-864e13))&&'"+275760-09-13T00:00:00.000Z"'==u(new l(864e13))&&'"-000001-01-01T00:00:00.000Z"'==u(new l(-621987552e5))&&'"1969-12-31T23:59:59.999Z"'==u(new l(-1))}catch(f){c=!1}}i=c}if("json-parse"==t){var h=e.parse;if("function"==typeof h)try{if(0===h("0")&&!h(!1)){s=h(a);var d=5==s.a.length&&1===s.a[0];if(d){try{d=!h('"	"')}catch(f){}if(d)try{d=1!==h("01")}catch(f){}if(d)try{d=1!==h("1.")}catch(f){}}}}catch(f){d=!1}i=d}}return n[t]=!!i}t||(t=u.Object()),e||(e=u.Object());var r=t.Number||u.Number,o=t.String||u.String,a=t.Object||u.Object,l=t.Date||u.Date,c=t.SyntaxError||u.SyntaxError,f=t.TypeError||u.TypeError,h=t.Math||u.Math,d=t.JSON||u.JSON;"object"==typeof d&&d&&(e.stringify=d.stringify,e.parse=d.parse);var p,v,m,y=a.prototype,b=y.toString,g=new l(-0xc782b5b800cec);try{g=-109252==g.getUTCFullYear()&&0===g.getUTCMonth()&&1===g.getUTCDate()&&10==g.getUTCHours()&&37==g.getUTCMinutes()&&6==g.getUTCSeconds()&&708==g.getUTCMilliseconds()}catch(w){}if(!n("json")){var x="[object Function]",_="[object Date]",E="[object Number]",j="[object String]",T="[object Array]",S="[object Boolean]",O=n("bug-string-char-index");if(!g)var C=h.floor,A=[0,31,59,90,120,151,181,212,243,273,304,334],N=function(t,e){return A[e]+365*(t-1970)+C((t-1969+(e=+(e>1)))/4)-C((t-1901+e)/100)+C((t-1601+e)/400)};if((p=y.hasOwnProperty)||(p=function(t){var e,n={};return(n.__proto__=null,n.__proto__={toString:1},n).toString!=b?p=function(t){var e=this.__proto__,n=t in(this.__proto__=null,this);return this.__proto__=e,n}:(e=n.constructor,p=function(t){var n=(this.constructor||e).prototype;return t in this&&!(t in n&&this[t]===n[t])}),n=null,p.call(this,t)}),v=function(t,e){var n,r,i,o=0;(n=function(){this.valueOf=0}).prototype.valueOf=0,r=new n;for(i in r)p.call(r,i)&&o++;return n=r=null,o?v=2==o?function(t,e){var n,r={},i=b.call(t)==x;for(n in t)i&&"prototype"==n||p.call(r,n)||!(r[n]=1)||!p.call(t,n)||e(n)}:function(t,e){var n,r,i=b.call(t)==x;for(n in t)i&&"prototype"==n||!p.call(t,n)||(r="constructor"===n)||e(n);(r||p.call(t,n="constructor"))&&e(n)}:(r=["valueOf","toString","toLocaleString","propertyIsEnumerable","isPrototypeOf","hasOwnProperty","constructor"],v=function(t,e){var n,i,o=b.call(t)==x,a=!o&&"function"!=typeof t.constructor&&s[typeof t.hasOwnProperty]&&t.hasOwnProperty||p;for(n in t)o&&"prototype"==n||!a.call(t,n)||e(n);for(i=r.length;n=r[--i];a.call(t,n)&&e(n));}),v(t,e)},!n("json-stringify")){var k={92:"\\\\",34:'\\"',8:"\\b",12:"\\f",10:"\\n",13:"\\r",9:"\\t"},I="000000",P=function(t,e){return(I+(e||0)).slice(-t)},L="\\u00",R=function(t){for(var e='"',n=0,r=t.length,i=!O||r>10,o=i&&(O?t.split(""):t);r>n;n++){var s=t.charCodeAt(n);switch(s){case 8:case 9:case 10:case 12:case 13:case 34:case 92:e+=k[s];break;default:if(32>s){e+=L+P(2,s.toString(16));break}e+=i?o[n]:t.charAt(n)}}return e+'"'},U=function(t,e,n,r,i,o,s){var a,u,l,c,h,d,y,g,w,x,O,A,k,I,L,M;try{a=e[t]}catch(q){}if("object"==typeof a&&a)if(u=b.call(a),u!=_||p.call(a,"toJSON"))"function"==typeof a.toJSON&&(u!=E&&u!=j&&u!=T||p.call(a,"toJSON"))&&(a=a.toJSON(t));else if(a>-1/0&&1/0>a){if(N){for(h=C(a/864e5),l=C(h/365.2425)+1970-1;N(l+1,0)<=h;l++);for(c=C((h-N(l,0))/30.42);N(l,c+1)<=h;c++);h=1+h-N(l,c),d=(a%864e5+864e5)%864e5,y=C(d/36e5)%24,g=C(d/6e4)%60,w=C(d/1e3)%60,x=d%1e3}else l=a.getUTCFullYear(),c=a.getUTCMonth(),h=a.getUTCDate(),y=a.getUTCHours(),g=a.getUTCMinutes(),w=a.getUTCSeconds(),x=a.getUTCMilliseconds();a=(0>=l||l>=1e4?(0>l?"-":"+")+P(6,0>l?-l:l):P(4,l))+"-"+P(2,c+1)+"-"+P(2,h)+"T"+P(2,y)+":"+P(2,g)+":"+P(2,w)+"."+P(3,x)+"Z"}else a=null;if(n&&(a=n.call(e,t,a)),null===a)return"null";if(u=b.call(a),u==S)return""+a;if(u==E)return a>-1/0&&1/0>a?""+a:"null";if(u==j)return R(""+a);if("object"==typeof a){for(I=s.length;I--;)if(s[I]===a)throw f();if(s.push(a),O=[],L=o,o+=i,u==T){for(k=0,I=a.length;I>k;k++)A=U(k,a,n,r,i,o,s),O.push(A===m?"null":A);M=O.length?i?"[\n"+o+O.join(",\n"+o)+"\n"+L+"]":"["+O.join(",")+"]":"[]"}else v(r||a,function(t){var e=U(t,a,n,r,i,o,s);e!==m&&O.push(R(t)+":"+(i?" ":"")+e)}),M=O.length?i?"{\n"+o+O.join(",\n"+o)+"\n"+L+"}":"{"+O.join(",")+"}":"{}";return s.pop(),M}};e.stringify=function(t,e,n){var r,i,o,a;if(s[typeof e]&&e)if((a=b.call(e))==x)i=e;else if(a==T){o={};for(var u,l=0,c=e.length;c>l;u=e[l++],a=b.call(u),(a==j||a==E)&&(o[u]=1));}if(n)if((a=b.call(n))==E){if((n-=n%1)>0)for(r="",n>10&&(n=10);r.length<n;r+=" ");}else a==j&&(r=n.length<=10?n:n.slice(0,10));return U("",(u={},u[""]=t,u),i,o,r,"",[])}}if(!n("json-parse")){var M,q,D=o.fromCharCode,W={92:"\\",34:'"',47:"/",98:"\b",116:"	",110:"\n",102:"\f",114:"\r"},J=function(){throw M=q=null,c()},B=function(){for(var t,e,n,r,i,o=q,s=o.length;s>M;)switch(i=o.charCodeAt(M)){case 9:case 10:case 13:case 32:M++;break;case 123:case 125:case 91:case 93:case 58:case 44:return t=O?o.charAt(M):o[M],M++,t;case 34:for(t="@",M++;s>M;)if(i=o.charCodeAt(M),32>i)J();else if(92==i)switch(i=o.charCodeAt(++M)){case 92:case 34:case 47:case 98:case 116:case 110:case 102:case 114:t+=W[i],M++;break;case 117:for(e=++M,n=M+4;n>M;M++)i=o.charCodeAt(M),i>=48&&57>=i||i>=97&&102>=i||i>=65&&70>=i||J();t+=D("0x"+o.slice(e,M));break;default:J()}else{if(34==i)break;for(i=o.charCodeAt(M),e=M;i>=32&&92!=i&&34!=i;)i=o.charCodeAt(++M);t+=o.slice(e,M)}if(34==o.charCodeAt(M))return M++,t;J();default:if(e=M,45==i&&(r=!0,i=o.charCodeAt(++M)),i>=48&&57>=i){for(48==i&&(i=o.charCodeAt(M+1),i>=48&&57>=i)&&J(),r=!1;s>M&&(i=o.charCodeAt(M),i>=48&&57>=i);M++);if(46==o.charCodeAt(M)){for(n=++M;s>n&&(i=o.charCodeAt(n),i>=48&&57>=i);n++);n==M&&J(),M=n}if(i=o.charCodeAt(M),101==i||69==i){for(i=o.charCodeAt(++M),(43==i||45==i)&&M++,n=M;s>n&&(i=o.charCodeAt(n),i>=48&&57>=i);n++);n==M&&J(),M=n}return+o.slice(e,M)}if(r&&J(),"true"==o.slice(M,M+4))return M+=4,!0;if("false"==o.slice(M,M+5))return M+=5,!1;if("null"==o.slice(M,M+4))return M+=4,null;J()}return"$"},G=function(t){var e,n;if("$"==t&&J(),"string"==typeof t){if("@"==(O?t.charAt(0):t[0]))return t.slice(1);if("["==t){for(e=[];t=B(),"]"!=t;n||(n=!0))n&&(","==t?(t=B(),"]"==t&&J()):J()),","==t&&J(),e.push(G(t));return e}if("{"==t){for(e={};t=B(),"}"!=t;n||(n=!0))n&&(","==t?(t=B(),"}"==t&&J()):J()),(","==t||"string"!=typeof t||"@"!=(O?t.charAt(0):t[0])||":"!=B())&&J(),e[t.slice(1)]=G(B());return e}J()}return t},F=function(t,e,n){var r=H(t,e,n);r===m?delete t[e]:t[e]=r},H=function(t,e,n){var r,i=t[e];if("object"==typeof i&&i)if(b.call(i)==T)for(r=i.length;r--;)F(i,r,n);else v(i,function(t){F(i,t,n)});return n.call(t,e,i)};e.parse=function(t,e){var n,r;return M=0,q=""+t,n=G(B()),"$"!=B()&&J(),M=q=null,e&&b.call(e)==x?H((r={},r[""]=n,r),"",e):n}}}return e.runInContext=i,e}var o="function"==typeof t&&t.amd,s={"function":!0,object:!0},a=s[typeof r]&&r&&!r.nodeType&&r,u=s[typeof window]&&window||this,l=a&&s[typeof n]&&n&&!n.nodeType&&"object"==typeof e&&e;if(!l||l.global!==l&&l.window!==l&&l.self!==l||(u=l),a&&!o)i(u,a);else{var c=u.JSON,f=u.JSON3,h=!1,d=i(u,u.JSON3={noConflict:function(){return h||(h=!0,u.JSON=c,u.JSON3=f,c=f=null),d}});u.JSON={parse:d.parse,stringify:d.stringify}}o&&t(function(){return d})}).call(this)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],56:[function(t,e){"use strict";function n(t){var e=u.exec(t);return{protocol:e[1]?e[1].toLowerCase():"",slashes:!!e[2],rest:e[3]?e[3]:""}}function r(t,e,u){if(!(this instanceof r))return new r(t,e,u);var c,f,h,d,p=a.test(t),v=typeof e,m=this,y=0;"object"!==v&&"string"!==v&&(u=e,e=null),u&&"function"!=typeof u&&(u=s.parse),e=o(e);var b=n(t);for(m.protocol=b.protocol||e.protocol||"",m.slashes=b.slashes||e.slashes,t=b.rest;y<l.length;y++)f=l[y],c=f[0],d=f[1],c!==c?m[d]=t:"string"==typeof c?~(h=t.indexOf(c))&&("number"==typeof f[2]?(m[d]=t.slice(0,h),t=t.slice(h+f[2])):(m[d]=t.slice(h),t=t.slice(0,h))):(h=c.exec(t))&&(m[d]=h[1],t=t.slice(0,t.length-h[0].length)),m[d]=m[d]||(f[3]||"port"===d&&p?e[d]||"":""),f[4]&&(m[d]=m[d].toLowerCase());u&&(m.query=u(m.query)),i(m.port,m.protocol)||(m.host=m.hostname,m.port=""),m.username=m.password="",m.auth&&(f=m.auth.split(":"),m.username=f[0]||"",m.password=f[1]||""),m.href=m.toString()}var i=t("requires-port"),o=t("./lolcation"),s=t("querystringify"),a=/^\/(?!\/)/,u=/^([a-z0-9.+-]+:)?(\/\/)?(.*)$/i,l=[["#","hash"],["?","query"],["/","pathname"],["@","auth",1],[0/0,"host",void 0,1,1],[/\:(\d+)$/,"port"],[0/0,"hostname",void 0,1,1]];r.prototype.set=function(t,e,n){var r=this;return"query"===t?("string"==typeof e&&e.length&&(e=(n||s.parse)(e)),r[t]=e):"port"===t?(r[t]=e,i(e,r.protocol)?e&&(r.host=r.hostname+":"+e):(r.host=r.hostname,r[t]="")):"hostname"===t?(r[t]=e,r.port&&(e+=":"+r.port),r.host=e):"host"===t?(r[t]=e,/\:\d+/.test(e)&&(e=e.split(":"),r.hostname=e[0],r.port=e[1])):"protocol"===t?(r.protocol=e,r.slashes=!n):r[t]=e,r.href=r.toString(),r},r.prototype.toString=function(t){t&&"function"==typeof t||(t=s.stringify);var e,n=this,r=n.protocol;r&&":"!==r.charAt(r.length-1)&&(r+=":");var i=r+(n.slashes?"//":"");return n.username&&(i+=n.username,n.password&&(i+=":"+n.password),i+="@"),i+=n.hostname,n.port&&(i+=":"+n.port),i+=n.pathname,e="object"==typeof n.query?t(n.query):n.query,e&&(i+="?"!==e.charAt(0)?"?"+e:e),n.hash&&(i+=n.hash),i},r.qs=s,r.location=o,e.exports=r},{"./lolcation":57,querystringify:58,"requires-port":59}],57:[function(t,e){(function(n){"use strict";var r,i=/^[A-Za-z][A-Za-z0-9+-.]*:\/\//,o={hash:1,query:1};e.exports=function(e){e=e||n.location||{},r=r||t("./");var s,a={},u=typeof e;if("blob:"===e.protocol)a=new r(unescape(e.pathname),{});else if("string"===u){a=new r(e,{});for(s in o)delete a[s]}else if("object"===u){for(s in e)s in o||(a[s]=e[s]);void 0===a.slashes&&(a.slashes=i.test(e.href))}return a}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./":56}],58:[function(t,e,n){"use strict";function r(t){for(var e,n=/([^=?&]+)=([^&]*)/g,r={};e=n.exec(t);r[decodeURIComponent(e[1])]=decodeURIComponent(e[2]));return r}function i(t,e){e=e||"";var n=[];"string"!=typeof e&&(e="?");for(var r in t)o.call(t,r)&&n.push(encodeURIComponent(r)+"="+encodeURIComponent(t[r]));return n.length?e+n.join("&"):""}var o=Object.prototype.hasOwnProperty;n.stringify=i,n.parse=r},{}],59:[function(t,e){"use strict";e.exports=function(t,e){if(e=e.split(":")[0],t=+t,!t)return!1;switch(e){case"http":case"ws":return 80!==t;case"https":case"wss":return 443!==t;case"ftp":return 21!==t;case"gopher":return 70!==t;case"file":return!1}return 0!==t}},{}]},{},[1])(1)});
 \ No newline at end of file
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2
-[InternetShortcut]
-URL=http://fly.layui.com/
-IDList=
-HotKey=0
-IconFile=F:\bd_xianxin\bayuanbao\www\favicon.ico
-IconIndex=0
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2
-[InternetShortcut]
-URL=http://sentsin.com/jquery/layer/
-IDList=
-HotKey=0
-/*! layer弹层组件拓展类 */
-;!function(){layer.use("skin/layer.ext.css",function(){layer.layui_layer_extendlayerextjs=!0});var a=layer.cache||{},b=function(b){return a.skin?" "+a.skin+" "+a.skin+"-"+b:""};layer.prompt=function(a,c){a=a||{},"function"==typeof a&&(c=a);var d,e=2==a.formType?'<textarea class="layui-layer-input">'+(a.value||"")+"</textarea>":function(){return'<input type="'+(1==a.formType?"password":"text")+'" class="layui-layer-input" value="'+(a.value||"")+'">'}();return layer.open($.extend({btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],content:e,skin:"layui-layer-prompt"+b("prompt"),success:function(a){d=a.find(".layui-layer-input"),d.focus()},yes:function(b){var e=d.val();""===e?d.focus():e.length>(a.maxlength||500)?layer.tips("&#x6700;&#x591A;&#x8F93;&#x5165;"+(a.maxlength||500)+"&#x4E2A;&#x5B57;&#x6570;",d,{tips:1}):c&&c(e,b,d)}},a))},layer.tab=function(a){a=a||{};var c=a.tab||{};return layer.open($.extend({type:1,skin:"layui-layer-tab"+b("tab"),title:function(){var a=c.length,b=1,d="";if(a>0)for(d='<span class="layui-layer-tabnow">'+c[0].title+"</span>";a>b;b++)d+="<span>"+c[b].title+"</span>";return d}(),content:'<ul class="layui-layer-tabmain">'+function(){var a=c.length,b=1,d="";if(a>0)for(d='<li class="layui-layer-tabli xubox_tab_layer">'+(c[0].content||"no content")+"</li>";a>b;b++)d+='<li class="layui-layer-tabli">'+(c[b].content||"no  content")+"</li>";return d}()+"</ul>",success:function(b){var c=b.find(".layui-layer-title").children(),d=b.find(".layui-layer-tabmain").children();c.on("mousedown",function(b){b.stopPropagation?b.stopPropagation():b.cancelBubble=!0;var c=$(this),e=c.index();c.addClass("layui-layer-tabnow").siblings().removeClass("layui-layer-tabnow"),d.eq(e).show().siblings().hide(),"function"==typeof a.change&&a.change(e)})}},a))},layer.photos=function(a,c,d){function e(a,b,c){var d=new Image;d.onload=function(){d.onload=null,b(d)},d.onerror=function(a){d.onerror=null,c(a)},d.src=a}var f={};if(a=a||{},a.photos){var g=a.photos.constructor===Object,h=g?a.photos:{},i=h.data||[],j=h.start||0;if(f.imgIndex=j+1,g){if(0===i.length)return layer.msg("&#x6CA1;&#x6709;&#x56FE;&#x7247;")}else{var k=$(a.photos),l=function(){return i=[],k.find(a.img||"img").each(function(a){var b=$(this);i.push({alt:b.attr("alt"),pid:b.attr("layer-pid"),src:b.attr("layer-src")||b.attr("src"),thumb:b.attr("src")})}),arguments.callee}();if(0===i.length)return;if(c||k.on("click",a.img||"img",function(){var b=$(this),c=b.index();l(),layer.photos($.extend(a,{photos:{start:c,data:i,tab:a.tab},full:a.full}),!0)}),!c)return}f.imgprev=function(a){f.imgIndex--,f.imgIndex<1&&(f.imgIndex=i.length),f.tabimg(a)},f.imgnext=function(a,b){f.imgIndex++,f.imgIndex>i.length&&(f.imgIndex=1,b)||f.tabimg(a)},f.keyup=function(a){if(!f.end){var b=a.keyCode;a.preventDefault(),37===b?f.imgprev(!0):39===b?f.imgnext(!0):27===b&&layer.close(f.index)}},f.tabimg=function(b){i.length<=1||(h.start=f.imgIndex-1,layer.close(f.index),layer.photos(a,!0,b))},f.event=function(){f.bigimg.hover(function(){f.imgsee.show()},function(){f.imgsee.hide()}),f.bigimg.find(".layui-layer-imgprev").on("click",function(a){a.preventDefault(),f.imgprev()}),f.bigimg.find(".layui-layer-imgnext").on("click",function(a){a.preventDefault(),f.imgnext()}),$(document).on("keyup",f.keyup)},f.loadi=layer.load(1,{shade:"shade"in a?!1:.9,scrollbar:!1}),e(i[j].src,function(c){layer.close(f.loadi),f.index=layer.open($.extend({type:1,area:function(){var b=[c.width,c.height],d=[$(window).width()-100,$(window).height()-100];return!a.full&&b[0]>d[0]&&(b[0]=d[0],b[1]=b[0]*d[1]/b[0]),[b[0]+"px",b[1]+"px"]}(),title:!1,shade:.9,shadeClose:!0,closeBtn:!1,move:".layui-layer-phimg img",moveType:1,scrollbar:!1,moveOut:!0,shift:5*Math.random()|0,skin:"layui-layer-photos"+b("photos"),content:'<div class="layui-layer-phimg"><img src="'+i[j].src+'" alt="'+(i[j].alt||"")+'" layer-pid="'+i[j].pid+'"><div class="layui-layer-imgsee">'+(i.length>1?'<span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span>':"")+'<div class="layui-layer-imgbar" style="display:'+(d?"block":"")+'"><span class="layui-layer-imgtit"><a href="javascript:;">'+(i[j].alt||"")+"</a><em>"+f.imgIndex+"/"+i.length+"</em></span></div></div></div>",success:function(b,c){f.bigimg=b.find(".layui-layer-phimg"),f.imgsee=b.find(".layui-layer-imguide,.layui-layer-imgbar"),f.event(b),a.tab&&a.tab(i[j],b)},end:function(){f.end=!0,$(document).off("keyup",f.keyup)}},a))},function(){layer.close(f.loadi),layer.msg("&#x5F53;&#x524D;&#x56FE;&#x7247;&#x5730;&#x5740;&#x5F02;&#x5E38;<br>&#x662F;&#x5426;&#x7EE7;&#x7EED;&#x67E5;&#x770B;&#x4E0B;&#x4E00;&#x5F20;&#xFF1F;",{time:3e4,btn:["下一张","不看了"],yes:function(){i.length>1&&f.imgnext(!0,!0)}})})}}}();
 \ No newline at end of file
-/*! layer-v2.2 弹层组件 License LGPL  http://layer.layui.com/ By 贤心 */
-;!function(a,b){"use strict";var c,d,e={getPath:function(){var a=document.scripts,b=a[a.length-1],c=b.src;if(!b.getAttribute("merge"))return c.substring(0,c.lastIndexOf("/")+1)}(),enter:function(a){13===a.keyCode&&a.preventDefault()},config:{},end:{},btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],type:["dialog","page","iframe","loading","tips"]},f={v:"2.2",ie6:!!a.ActiveXObject&&!a.XMLHttpRequest,index:0,path:e.getPath,config:function(a,b){var d=0;return a=a||{},f.cache=e.config=c.extend(e.config,a),f.path=e.config.path||f.path,"string"==typeof a.extend&&(a.extend=[a.extend]),f.use("skin/layer.css",a.extend&&a.extend.length>0?function g(){var c=a.extend;f.use(c[c[d]?d:d-1],d<c.length?function(){return++d,g}():b)}():b),this},use:function(a,b,d){var e=c("head")[0],a=a.replace(/\s/g,""),g=/\.css$/.test(a),h=document.createElement(g?"link":"script"),i="layui_layer_"+a.replace(/\.|\//g,"");return f.path?(g&&(h.rel="stylesheet"),h[g?"href":"src"]=/^http:\/\//.test(a)?a:f.path+a,h.id=i,c("#"+i)[0]||e.appendChild(h),function j(){(g?1989===parseInt(c("#"+i).css("width")):f[d||i])?function(){b&&b();try{g||e.removeChild(h)}catch(a){}}():setTimeout(j,100)}(),this):void 0},ready:function(a,b){var d="function"==typeof a;return d&&(b=a),f.config(c.extend(e.config,function(){return d?{}:{path:a}}()),b),this},alert:function(a,b,d){var e="function"==typeof b;return e&&(d=b),f.open(c.extend({content:a,yes:d},e?{}:b))},confirm:function(a,b,d,g){var h="function"==typeof b;return h&&(g=d,d=b),f.open(c.extend({content:a,btn:e.btn,yes:d,cancel:g},h?{}:b))},msg:function(a,d,g){var i="function"==typeof d,j=e.config.skin,k=(j?j+" "+j+"-msg":"")||"layui-layer-msg",l=h.anim.length-1;return i&&(g=d),f.open(c.extend({content:a,time:3e3,shade:!1,skin:k,title:!1,closeBtn:!1,btn:!1,end:g},i&&!e.config.skin?{skin:k+" layui-layer-hui",shift:l}:function(){return d=d||{},(-1===d.icon||d.icon===b&&!e.config.skin)&&(d.skin=k+" "+(d.skin||"layui-layer-hui")),d}()))},load:function(a,b){return f.open(c.extend({type:3,icon:a||0,shade:.01},b))},tips:function(a,b,d){return f.open(c.extend({type:4,content:[a,b],closeBtn:!1,time:3e3,shade:!1,maxWidth:210},d))}},g=function(a){var b=this;b.index=++f.index,b.config=c.extend({},b.config,e.config,a),b.creat()};g.pt=g.prototype;var h=["layui-layer",".layui-layer-title",".layui-layer-main",".layui-layer-dialog","layui-layer-iframe","layui-layer-content","layui-layer-btn","layui-layer-close"];h.anim=["layui-anim","layui-anim-01","layui-anim-02","layui-anim-03","layui-anim-04","layui-anim-05","layui-anim-06"],g.pt.config={type:0,shade:.3,fix:!0,move:h[1],title:"&#x4FE1;&#x606F;",offset:"auto",area:"auto",closeBtn:1,time:0,zIndex:19891014,maxWidth:360,shift:0,icon:-1,scrollbar:!0,tips:2},g.pt.vessel=function(a,b){var c=this,d=c.index,f=c.config,g=f.zIndex+d,i="object"==typeof f.title,j=f.maxmin&&(1===f.type||2===f.type),k=f.title?'<div class="layui-layer-title" style="'+(i?f.title[1]:"")+'">'+(i?f.title[0]:f.title)+"</div>":"";return f.zIndex=g,b([f.shade?'<div class="layui-layer-shade" id="layui-layer-shade'+d+'" times="'+d+'" style="'+("z-index:"+(g-1)+"; background-color:"+(f.shade[1]||"#000")+"; opacity:"+(f.shade[0]||f.shade)+"; filter:alpha(opacity="+(100*f.shade[0]||100*f.shade)+");")+'"></div>':"",'<div class="'+h[0]+" "+(h.anim[f.shift]||"")+(" layui-layer-"+e.type[f.type])+(0!=f.type&&2!=f.type||f.shade?"":" layui-layer-border")+" "+(f.skin||"")+'" id="'+h[0]+d+'" type="'+e.type[f.type]+'" times="'+d+'" showtime="'+f.time+'" conType="'+(a?"object":"string")+'" style="z-index: '+g+"; width:"+f.area[0]+";height:"+f.area[1]+(f.fix?"":";position:absolute;")+'">'+(a&&2!=f.type?"":k)+'<div id="'+(f.id||"")+'" class="layui-layer-content'+(0==f.type&&-1!==f.icon?" layui-layer-padding":"")+(3==f.type?" layui-layer-loading"+f.icon:"")+'">'+(0==f.type&&-1!==f.icon?'<i class="layui-layer-ico layui-layer-ico'+f.icon+'"></i>':"")+(1==f.type&&a?"":f.content||"")+'</div><span class="layui-layer-setwin">'+function(){var a=j?'<a class="layui-layer-min" href="javascript:;"><cite></cite></a><a class="layui-layer-ico layui-layer-max" href="javascript:;"></a>':"";return f.closeBtn&&(a+='<a class="layui-layer-ico '+h[7]+" "+h[7]+(f.title?f.closeBtn:4==f.type?"1":"2")+'" href="javascript:;"></a>'),a}()+"</span>"+(f.btn?function(){var a="";"string"==typeof f.btn&&(f.btn=[f.btn]);for(var b=0,c=f.btn.length;c>b;b++)a+='<a class="'+h[6]+b+'">'+f.btn[b]+"</a>";return'<div class="'+h[6]+'">'+a+"</div>"}():"")+"</div>"],k),c},g.pt.creat=function(){var a=this,b=a.config,g=a.index,i=b.content,j="object"==typeof i;if(!c("#"+b.id)[0]){switch("string"==typeof b.area&&(b.area="auto"===b.area?["",""]:[b.area,""]),b.type){case 0:b.btn="btn"in b?b.btn:e.btn[0],f.closeAll("dialog");break;case 2:var i=b.content=j?b.content:[b.content||"http://layer.layui.com","auto"];b.content='<iframe scrolling="'+(b.content[1]||"auto")+'" allowtransparency="true" id="'+h[4]+g+'" name="'+h[4]+g+'" onload="this.className=\'\';" class="layui-layer-load" frameborder="0" src="'+b.content[0]+'"></iframe>';break;case 3:b.title=!1,b.closeBtn=!1,-1===b.icon&&0===b.icon,f.closeAll("loading");break;case 4:j||(b.content=[b.content,"body"]),b.follow=b.content[1],b.content=b.content[0]+'<i class="layui-layer-TipsG"></i>',b.title=!1,b.fix=!1,b.tips="object"==typeof b.tips?b.tips:[b.tips,!0],b.tipsMore||f.closeAll("tips")}a.vessel(j,function(d,e){c("body").append(d[0]),j?function(){2==b.type||4==b.type?function(){c("body").append(d[1])}():function(){i.parents("."+h[0])[0]||(i.show().addClass("layui-layer-wrap").wrap(d[1]),c("#"+h[0]+g).find("."+h[5]).before(e))}()}():c("body").append(d[1]),a.layero=c("#"+h[0]+g),b.scrollbar||h.html.css("overflow","hidden").attr("layer-full",g)}).auto(g),2==b.type&&f.ie6&&a.layero.find("iframe").attr("src",i[0]),c(document).off("keydown",e.enter).on("keydown",e.enter),a.layero.on("keydown",function(a){c(document).off("keydown",e.enter)}),4==b.type?a.tips():a.offset(),b.fix&&d.on("resize",function(){a.offset(),(/^\d+%$/.test(b.area[0])||/^\d+%$/.test(b.area[1]))&&a.auto(g),4==b.type&&a.tips()}),b.time<=0||setTimeout(function(){f.close(a.index)},b.time),a.move().callback()}},g.pt.auto=function(a){function b(a){a=g.find(a),a.height(i[1]-j-k-2*(0|parseFloat(a.css("padding"))))}var e=this,f=e.config,g=c("#"+h[0]+a);""===f.area[0]&&f.maxWidth>0&&(/MSIE 7/.test(navigator.userAgent)&&f.btn&&g.width(g.innerWidth()),g.outerWidth()>f.maxWidth&&g.width(f.maxWidth));var i=[g.innerWidth(),g.innerHeight()],j=g.find(h[1]).outerHeight()||0,k=g.find("."+h[6]).outerHeight()||0;switch(f.type){case 2:b("iframe");break;default:""===f.area[1]?f.fix&&i[1]>=d.height()&&(i[1]=d.height(),b("."+h[5])):b("."+h[5])}return e},g.pt.offset=function(){var a=this,b=a.config,c=a.layero,e=[c.outerWidth(),c.outerHeight()],f="object"==typeof b.offset;a.offsetTop=(d.height()-e[1])/2,a.offsetLeft=(d.width()-e[0])/2,f?(a.offsetTop=b.offset[0],a.offsetLeft=b.offset[1]||a.offsetLeft):"auto"!==b.offset&&(a.offsetTop=b.offset,"rb"===b.offset&&(a.offsetTop=d.height()-e[1],a.offsetLeft=d.width()-e[0])),b.fix||(a.offsetTop=/%$/.test(a.offsetTop)?d.height()*parseFloat(a.offsetTop)/100:parseFloat(a.offsetTop),a.offsetLeft=/%$/.test(a.offsetLeft)?d.width()*parseFloat(a.offsetLeft)/100:parseFloat(a.offsetLeft),a.offsetTop+=d.scrollTop(),a.offsetLeft+=d.scrollLeft()),c.css({top:a.offsetTop,left:a.offsetLeft})},g.pt.tips=function(){var a=this,b=a.config,e=a.layero,f=[e.outerWidth(),e.outerHeight()],g=c(b.follow);g[0]||(g=c("body"));var i={width:g.outerWidth(),height:g.outerHeight(),top:g.offset().top,left:g.offset().left},j=e.find(".layui-layer-TipsG"),k=b.tips[0];b.tips[1]||j.remove(),i.autoLeft=function(){i.left+f[0]-d.width()>0?(i.tipLeft=i.left+i.width-f[0],j.css({right:12,left:"auto"})):i.tipLeft=i.left},i.where=[function(){i.autoLeft(),i.tipTop=i.top-f[1]-10,j.removeClass("layui-layer-TipsB").addClass("layui-layer-TipsT").css("border-right-color",b.tips[1])},function(){i.tipLeft=i.left+i.width+10,i.tipTop=i.top,j.removeClass("layui-layer-TipsL").addClass("layui-layer-TipsR").css("border-bottom-color",b.tips[1])},function(){i.autoLeft(),i.tipTop=i.top+i.height+10,j.removeClass("layui-layer-TipsT").addClass("layui-layer-TipsB").css("border-right-color",b.tips[1])},function(){i.tipLeft=i.left-f[0]-10,i.tipTop=i.top,j.removeClass("layui-layer-TipsR").addClass("layui-layer-TipsL").css("border-bottom-color",b.tips[1])}],i.where[k-1](),1===k?i.top-(d.scrollTop()+f[1]+16)<0&&i.where[2]():2===k?d.width()-(i.left+i.width+f[0]+16)>0||i.where[3]():3===k?i.top-d.scrollTop()+i.height+f[1]+16-d.height()>0&&i.where[0]():4===k&&f[0]+16-i.left>0&&i.where[1](),e.find("."+h[5]).css({"background-color":b.tips[1],"padding-right":b.closeBtn?"30px":""}),e.css({left:i.tipLeft,top:i.tipTop})},g.pt.move=function(){var a=this,b=a.config,e={setY:0,moveLayer:function(){var a=e.layero,b=parseInt(a.css("margin-left")),c=parseInt(e.move.css("left"));0===b||(c-=b),"fixed"!==a.css("position")&&(c-=a.parent().offset().left,e.setY=0),a.css({left:c,top:parseInt(e.move.css("top"))-e.setY})}},f=a.layero.find(b.move);return b.move&&f.attr("move","ok"),f.css({cursor:b.move?"move":"auto"}),c(b.move).on("mousedown",function(a){if(a.preventDefault(),"ok"===c(this).attr("move")){e.ismove=!0,e.layero=c(this).parents("."+h[0]);var f=e.layero.offset().left,g=e.layero.offset().top,i=e.layero.outerWidth()-6,j=e.layero.outerHeight()-6;c("#layui-layer-moves")[0]||c("body").append('<div id="layui-layer-moves" class="layui-layer-moves" style="left:'+f+"px; top:"+g+"px; width:"+i+"px; height:"+j+'px; z-index:2147483584"></div>'),e.move=c("#layui-layer-moves"),b.moveType&&e.move.css({visibility:"hidden"}),e.moveX=a.pageX-e.move.position().left,e.moveY=a.pageY-e.move.position().top,"fixed"!==e.layero.css("position")||(e.setY=d.scrollTop())}}),c(document).mousemove(function(a){if(e.ismove){var c=a.pageX-e.moveX,f=a.pageY-e.moveY;if(a.preventDefault(),!b.moveOut){e.setY=d.scrollTop();var g=d.width()-e.move.outerWidth(),h=e.setY;0>c&&(c=0),c>g&&(c=g),h>f&&(f=h),f>d.height()-e.move.outerHeight()+e.setY&&(f=d.height()-e.move.outerHeight()+e.setY)}e.move.css({left:c,top:f}),b.moveType&&e.moveLayer(),c=f=g=h=null}}).mouseup(function(){try{e.ismove&&(e.moveLayer(),e.move.remove(),b.moveEnd&&b.moveEnd()),e.ismove=!1}catch(a){e.ismove=!1}}),a},g.pt.callback=function(){function a(){var a=g.cancel&&g.cancel(b.index);a===!1||f.close(b.index)}var b=this,d=b.layero,g=b.config;b.openLayer(),g.success&&(2==g.type?d.find("iframe").on("load",function(){g.success(d,b.index)}):g.success(d,b.index)),f.ie6&&b.IE6(d),d.find("."+h[6]).children("a").on("click",function(){var e=c(this).index();g["btn"+(e+1)]&&g["btn"+(e+1)](b.index,d),0===e?g.yes?g.yes(b.index,d):f.close(b.index):1===e?a():g["btn"+(e+1)]||f.close(b.index)}),d.find("."+h[7]).on("click",a),g.shadeClose&&c("#layui-layer-shade"+b.index).on("click",function(){f.close(b.index)}),d.find(".layui-layer-min").on("click",function(){f.min(b.index,g),g.min&&g.min(d)}),d.find(".layui-layer-max").on("click",function(){c(this).hasClass("layui-layer-maxmin")?(f.restore(b.index),g.restore&&g.restore(d)):(f.full(b.index,g),g.full&&g.full(d))}),g.end&&(e.end[b.index]=g.end)},e.reselect=function(){c.each(c("select"),function(a,b){var d=c(this);d.parents("."+h[0])[0]||1==d.attr("layer")&&c("."+h[0]).length<1&&d.removeAttr("layer").show(),d=null})},g.pt.IE6=function(a){function b(){a.css({top:f+(e.config.fix?d.scrollTop():0)})}var e=this,f=a.offset().top;b(),d.scroll(b),c("select").each(function(a,b){var d=c(this);d.parents("."+h[0])[0]||"none"===d.css("display")||d.attr({layer:"1"}).hide(),d=null})},g.pt.openLayer=function(){var a=this;f.zIndex=a.config.zIndex,f.setTop=function(a){var b=function(){f.zIndex++,a.css("z-index",f.zIndex+1)};return f.zIndex=parseInt(a[0].style.zIndex),a.on("mousedown",b),f.zIndex}},e.record=function(a){var b=[a.outerWidth(),a.outerHeight(),a.position().top,a.position().left+parseFloat(a.css("margin-left"))];a.find(".layui-layer-max").addClass("layui-layer-maxmin"),a.attr({area:b})},e.rescollbar=function(a){h.html.attr("layer-full")==a&&(h.html[0].style.removeProperty?h.html[0].style.removeProperty("overflow"):h.html[0].style.removeAttribute("overflow"),h.html.removeAttr("layer-full"))},a.layer=f,f.getChildFrame=function(a,b){return b=b||c("."+h[4]).attr("times"),c("#"+h[0]+b).find("iframe").contents().find(a)},f.getFrameIndex=function(a){return c("#"+a).parents("."+h[4]).attr("times")},f.iframeAuto=function(a){if(a){var b=f.getChildFrame("html",a).outerHeight(),d=c("#"+h[0]+a),e=d.find(h[1]).outerHeight()||0,g=d.find("."+h[6]).outerHeight()||0;d.css({height:b+e+g}),d.find("iframe").css({height:b})}},f.iframeSrc=function(a,b){c("#"+h[0]+a).find("iframe").attr("src",b)},f.style=function(a,b){var d=c("#"+h[0]+a),f=d.attr("type"),g=d.find(h[1]).outerHeight()||0,i=d.find("."+h[6]).outerHeight()||0;(f===e.type[1]||f===e.type[2])&&(d.css(b),f===e.type[2]&&d.find("iframe").css({height:parseFloat(b.height)-g-i}))},f.min=function(a,b){var d=c("#"+h[0]+a),g=d.find(h[1]).outerHeight()||0;e.record(d),f.style(a,{width:180,height:g,overflow:"hidden"}),d.find(".layui-layer-min").hide(),"page"===d.attr("type")&&d.find(h[4]).hide(),e.rescollbar(a)},f.restore=function(a){var b=c("#"+h[0]+a),d=b.attr("area").split(",");b.attr("type");f.style(a,{width:parseFloat(d[0]),height:parseFloat(d[1]),top:parseFloat(d[2]),left:parseFloat(d[3]),overflow:"visible"}),b.find(".layui-layer-max").removeClass("layui-layer-maxmin"),b.find(".layui-layer-min").show(),"page"===b.attr("type")&&b.find(h[4]).show(),e.rescollbar(a)},f.full=function(a){var b,g=c("#"+h[0]+a);e.record(g),h.html.attr("layer-full")||h.html.css("overflow","hidden").attr("layer-full",a),clearTimeout(b),b=setTimeout(function(){var b="fixed"===g.css("position");f.style(a,{top:b?0:d.scrollTop(),left:b?0:d.scrollLeft(),width:d.width(),height:d.height()}),g.find(".layui-layer-min").hide()},100)},f.title=function(a,b){var d=c("#"+h[0]+(b||f.index)).find(h[1]);d.html(a)},f.close=function(a){var b=c("#"+h[0]+a),d=b.attr("type");if(b[0]){if(d===e.type[1]&&"object"===b.attr("conType")){b.children(":not(."+h[5]+")").remove();for(var g=0;2>g;g++)b.find(".layui-layer-wrap").unwrap().hide()}else{if(d===e.type[2])try{var i=c("#"+h[4]+a)[0];i.contentWindow.document.write(""),i.contentWindow.close(),b.find("."+h[5])[0].removeChild(i)}catch(j){}b[0].innerHTML="",b.remove()}c("#layui-layer-moves, #layui-layer-shade"+a).remove(),f.ie6&&e.reselect(),e.rescollbar(a),c(document).off("keydown",e.enter),"function"==typeof e.end[a]&&e.end[a](),delete e.end[a]}},f.closeAll=function(a){c.each(c("."+h[0]),function(){var b=c(this),d=a?b.attr("type")===a:1;d&&f.close(b.attr("times")),d=null})},e.run=function(){c=jQuery,d=c(a),h.html=c("html"),f.open=function(a){var b=new g(a);return b.index}},"function"==typeof define?define(function(){return e.run(),f}):function(){e.run(),f.use("skin/layer.css")}()}(window);
 \ No newline at end of file
-/*!
- 
- @Name: layer's style
- @Author: 贤心
- @Blog： sentsin.com
- 
- */*html{background-image:url(about:blank);background-attachment:fixed}html #layui_layer_skinlayercss{display:none;position:absolute;width:1989px}.layui-layer,.layui-layer-shade{position:fixed;_position:absolute;pointer-events:auto}.layui-layer-shade{top:0;left:0;width:100%;height:100%;_height:expression(document.body.offsetHeight+"px")}.layui-layer{top:150px;left:50%;margin:0;padding:0;background-color:#fff;-webkit-background-clip:content;box-shadow:1px 1px 50px rgba(0,0,0,.3);border-radius:2px;-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:.3s;animation-duration:.3s}.layui-layer-close{position:absolute}.layui-layer-content{position:relative}.layui-layer-border{border:1px solid #B2B2B2;border:1px solid rgba(0,0,0,.3);box-shadow:1px 1px 5px rgba(0,0,0,.2)}.layui-layer-moves{position:absolute;border:3px solid #666;border:3px solid rgba(0,0,0,.5);cursor:move;background-color:#fff;background-color:rgba(255,255,255,.3);filter:alpha(opacity=50)}.layui-layer-load{background:url(default/loading-0.gif) center center no-repeat #fff}.layui-layer-ico{background:url(default/icon.png) no-repeat}.layui-layer-btn a,.layui-layer-dialog .layui-layer-ico,.layui-layer-setwin a{display:inline-block;*display:inline;*zoom:1;vertical-align:top}@-webkit-keyframes bounceIn{0%{opacity:0;-webkit-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}@keyframes bounceIn{0%{opacity:0;-webkit-transform:scale(.5);-ms-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}}.layui-anim{-webkit-animation-name:bounceIn;animation-name:bounceIn}@-webkit-keyframes bounceOut{100%{opacity:0;-webkit-transform:scale(.7);transform:scale(.7)}30%{-webkit-transform:scale(1.03);transform:scale(1.03)}0%{-webkit-transform:scale(1);transform:scale(1)}}@keyframes bounceOut{100%{opacity:0;-webkit-transform:scale(.7);-ms-transform:scale(.7);transform:scale(.7)}30%{-webkit-transform:scale(1.03);-ms-transform:scale(1.03);transform:scale(1.03)}0%{-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}}.layui-anim-close{-webkit-animation-name:bounceOut;animation-name:bounceOut;-webkit-animation-duration:.2s;animation-duration:.2s}@-webkit-keyframes zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);-ms-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);-ms-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layui-anim-01{-webkit-animation-name:zoomInDown;animation-name:zoomInDown}@-webkit-keyframes fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);-ms-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);-ms-transform:translateY(0);transform:translateY(0)}}.layui-anim-02{-webkit-animation-name:fadeInUpBig;animation-name:fadeInUpBig}@-webkit-keyframes zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);-ms-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);-ms-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layui-anim-03{-webkit-animation-name:zoomInLeft;animation-name:zoomInLeft}@-webkit-keyframes rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0) rotate(0);transform:translateX(0) rotate(0)}}@keyframes rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);-ms-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0) rotate(0);-ms-transform:translateX(0) rotate(0);transform:translateX(0) rotate(0)}}.layui-anim-04{-webkit-animation-name:rollIn;animation-name:rollIn}@keyframes fadeIn{0%{opacity:0}100%{opacity:1}}.layui-anim-05{-webkit-animation-name:fadeIn;animation-name:fadeIn}@-webkit-keyframes shake{0%,100%{-webkit-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);transform:translateX(10px)}}@keyframes shake{0%,100%{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);-ms-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);-ms-transform:translateX(10px);transform:translateX(10px)}}.layui-anim-06{-webkit-animation-name:shake;animation-name:shake}@-webkit-keyframes fadeIn{0%{opacity:0}100%{opacity:1}}.layui-layer-title{padding:0 80px 0 20px;height:42px;line-height:42px;border-bottom:1px solid #eee;font-size:14px;color:#333;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;background-color:#F8F8F8;border-radius:2px 2px 0 0}.layui-layer-setwin{position:absolute;right:15px;*right:0;top:15px;font-size:0;line-height:initial}.layui-layer-setwin a{position:relative;width:16px;height:16px;margin-left:10px;font-size:12px;_overflow:hidden}.layui-layer-setwin .layui-layer-min cite{position:absolute;width:14px;height:2px;left:0;top:50%;margin-top:-1px;background-color:#2E2D3C;cursor:pointer;_overflow:hidden}.layui-layer-setwin .layui-layer-min:hover cite{background-color:#2D93CA}.layui-layer-setwin .layui-layer-max{background-position:-32px -40px}.layui-layer-setwin .layui-layer-max:hover{background-position:-16px -40px}.layui-layer-setwin .layui-layer-maxmin{background-position:-65px -40px}.layui-layer-setwin .layui-layer-maxmin:hover{background-position:-49px -40px}.layui-layer-setwin .layui-layer-close1{background-position:0 -40px;cursor:pointer}.layui-layer-setwin .layui-layer-close1:hover{opacity:.7}.layui-layer-setwin .layui-layer-close2{position:absolute;right:-28px;top:-28px;width:30px;height:30px;margin-left:0;background-position:-149px -31px;*right:-18px;_display:none}.layui-layer-setwin .layui-layer-close2:hover{background-position:-180px -31px}.layui-layer-btn{text-align:right;padding:0 10px 12px;pointer-events:auto}.layui-layer-btn a{height:28px;line-height:28px;margin:0 6px;padding:0 15px;border:1px solid #dedede;background-color:#f1f1f1;color:#333;border-radius:2px;font-weight:400;cursor:pointer;text-decoration:none}.layui-layer-btn a:hover{opacity:.9;text-decoration:none}.layui-layer-btn a:active{opacity:.7}.layui-layer-btn .layui-layer-btn0{border-color:#4898d5;background-color:#2e8ded;color:#fff}.layui-layer-dialog{min-width:260px}.layui-layer-dialog .layui-layer-content{position:relative;padding:20px;line-height:24px;word-break:break-all;font-size:14px;overflow:auto}.layui-layer-dialog .layui-layer-content .layui-layer-ico{position:absolute;top:16px;left:15px;_left:-40px;width:30px;height:30px}.layui-layer-ico1{background-position:-30px 0}.layui-layer-ico2{background-position:-60px 0}.layui-layer-ico3{background-position:-90px 0}.layui-layer-ico4{background-position:-120px 0}.layui-layer-ico5{background-position:-150px 0}.layui-layer-ico6{background-position:-180px 0}.layui-layer-rim{border:6px solid #8D8D8D;border:6px solid rgba(0,0,0,.3);border-radius:5px;box-shadow:none}.layui-layer-msg{min-width:180px;border:1px solid #D3D4D3;box-shadow:none}.layui-layer-hui{min-width:100px;background-color:#000;filter:alpha(opacity=60);background-color:rgba(0,0,0,.6);color:#fff;border:none}.layui-layer-hui .layui-layer-content{padding:12px 25px;text-align:center}.layui-layer-dialog .layui-layer-padding{padding:20px 20px 20px 55px;text-align:left}.layui-layer-page .layui-layer-content{position:relative;overflow:auto}.layui-layer-iframe .layui-layer-btn,.layui-layer-page .layui-layer-btn{padding-top:10px}.layui-layer-nobg{background:0 0}.layui-layer-iframe .layui-layer-content{overflow:hidden}.layui-layer-iframe iframe{display:block;width:100%}.layui-layer-loading{border-radius:100%;background:0 0;box-shadow:none;border:none}.layui-layer-loading .layui-layer-content{width:60px;height:24px;background:url(default/loading-0.gif) no-repeat}.layui-layer-loading .layui-layer-loading1{width:37px;height:37px;background:url(default/loading-1.gif) no-repeat}.layui-layer-ico16,.layui-layer-loading .layui-layer-loading2{width:32px;height:32px;background:url(default/loading-2.gif) no-repeat}.layui-layer-tips{background:0 0;box-shadow:none;border:none}.layui-layer-tips .layui-layer-content{position:relative;line-height:22px;min-width:12px;padding:5px 10px;font-size:12px;_float:left;border-radius:3px;box-shadow:1px 1px 3px rgba(0,0,0,.3);background-color:#F90;color:#fff}.layui-layer-tips .layui-layer-close{right:-2px;top:-1px}.layui-layer-tips i.layui-layer-TipsG{position:absolute;width:0;height:0;border-width:8px;border-color:transparent;border-style:dashed;*overflow:hidden}.layui-layer-tips i.layui-layer-TipsB,.layui-layer-tips i.layui-layer-TipsT{left:5px;border-right-style:solid;border-right-color:#F90}.layui-layer-tips i.layui-layer-TipsT{bottom:-8px}.layui-layer-tips i.layui-layer-TipsB{top:-8px}.layui-layer-tips i.layui-layer-TipsL,.layui-layer-tips i.layui-layer-TipsR{top:1px;border-bottom-style:solid;border-bottom-color:#F90}.layui-layer-tips i.layui-layer-TipsR{left:-8px}.layui-layer-tips i.layui-layer-TipsL{right:-8px}.layui-layer-lan[type=dialog]{min-width:280px}.layui-layer-lan .layui-layer-title{background:#4476A7;color:#fff;border:none}.layui-layer-lan .layui-layer-btn{padding:10px;text-align:right;border-top:1px solid #E9E7E7}.layui-layer-lan .layui-layer-btn a{background:#BBB5B5;border:none}.layui-layer-lan .layui-layer-btn .layui-layer-btn1{background:#C9C5C5}.layui-layer-molv .layui-layer-title{background:#009f95;color:#fff;border:none}.layui-layer-molv .layui-layer-btn a{background:#009f95}.layui-layer-molv .layui-layer-btn .layui-layer-btn1{background:#92B8B1}
 \ No newline at end of file
-/*!
- 
- @Name: layer拓展样式
- @Date: 2012.12.13
- @Author: 贤心
- @blog: sentsin.com
- 
- */.layui-layer-imgbar,.layui-layer-imgtit a,.layui-layer-tab .layui-layer-title span{text-overflow:ellipsis;white-space:nowrap}.layui-layer-iconext{background:url(default/icon-ext.png) no-repeat}html #layui_layer_skinlayerextcss{display:none;position:absolute;width:1989px}.layui-layer-prompt .layui-layer-input{display:block;width:220px;height:30px;margin:0 auto;line-height:30px;padding:0 5px;border:1px solid #ccc;box-shadow:1px 1px 5px rgba(0,0,0,.1) inset;color:#333}.layui-layer-prompt textarea.layui-layer-input{width:300px;height:100px;line-height:20px}.layui-layer-tab{box-shadow:1px 1px 50px rgba(0,0,0,.4)}.layui-layer-tab .layui-layer-title{padding-left:0;border-bottom:1px solid #ccc;background-color:#eee;overflow:visible}.layui-layer-tab .layui-layer-title span{position:relative;float:left;min-width:80px;max-width:260px;padding:0 20px;text-align:center;cursor:default;overflow:hidden}.layui-layer-tab .layui-layer-title span.layui-layer-tabnow{height:43px;border-left:1px solid #ccc;border-right:1px solid #ccc;background-color:#fff;z-index:10}.layui-layer-tab .layui-layer-title span:first-child{border-left:none}.layui-layer-tabmain{line-height:24px;clear:both}.layui-layer-tabmain .layui-layer-tabli{display:none}.layui-layer-tabmain .layui-layer-tabli.xubox_tab_layer{display:block}.xubox_tabclose{position:absolute;right:10px;top:5px;cursor:pointer}.layui-layer-photos{-webkit-animation-duration:1s;animation-duration:1s}.layui-layer-photos .layui-layer-content{overflow:hidden;text-align:center}.layui-layer-photos .layui-layer-phimg img{position:relative;width:100%;display:inline-block;*display:inline;*zoom:1;vertical-align:top}.layui-layer-imgbar,.layui-layer-imguide{display:none}.layui-layer-imgnext,.layui-layer-imgprev{position:absolute;top:50%;width:27px;_width:44px;height:44px;margin-top:-22px;outline:0;blr:expression(this.onFocus=this.blur())}.layui-layer-imgprev{left:10px;background-position:-5px -5px;_background-position:-70px -5px}.layui-layer-imgprev:hover{background-position:-33px -5px;_background-position:-120px -5px}.layui-layer-imgnext{right:10px;_right:8px;background-position:-5px -50px;_background-position:-70px -50px}.layui-layer-imgnext:hover{background-position:-33px -50px;_background-position:-120px -50px}.layui-layer-imgbar{position:absolute;left:0;bottom:0;width:100%;height:32px;line-height:32px;background-color:rgba(0,0,0,.8);background-color:#000\9;filter:Alpha(opacity=80);color:#fff;overflow:hidden;font-size:0}.layui-layer-imgtit *{display:inline-block;*display:inline;*zoom:1;vertical-align:top;font-size:12px}.layui-layer-imgtit a{max-width:65%;overflow:hidden;color:#fff}.layui-layer-imgtit a:hover{color:#fff;text-decoration:underline}.layui-layer-imgtit em{padding-left:10px;font-style:normal}
 \ No newline at end of file
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>layer-更懂你的web弹窗解决方案</title>
+<script src="http://libs.baidu.com/jquery/1.9.1/jquery.min.js"></script>
+<script src="layer/layer.js"></script>
+
+<style>
+html{background-color:#E3E3E3; font-size:14px; color:#000; font-family:'微软雅黑'}
+a,a:hover{ text-decoration:none;}
+pre{font-family:'微软雅黑'}
+.box{padding:20px; background-color:#fff; margin:50px 100px; border-radius:5px;}
+.box a{padding-right:15px;}
+#about_hide{display:none}
+.layer_text{background-color:#fff; padding:20px;}
+.layer_text p{margin-bottom: 10px; text-indent: 2em; line-height: 23px;}
+.button{display:inline-block; *display:inline; *zoom:1; line-height:30px; padding:0 20px; background-color:#56B4DC; color:#fff; font-size:14px; border-radius:3px; cursor:pointer; font-weight:normal;}
+.photos-demo img{width:200px;}
+</style>
+</head>
+<body>
+<div class="box">
+<pre>
+ @Name：layer-v<script>document.write(layer.v)</script> 弹层组件说明
+ @Author：贤心 
+ @Site：<a href="http://layer.layui.com/?form=local"  target="_blank">http://layer.layui.com</a>
+ @Github：<a href="https://github.com/sentsin/layer"  target="_blank">https://github.com/sentsin/layer</a>
+
+
+<strong>【注意事项】</strong>
+一、使用时，请把文件夹layer整个放置在您站点的任何一个目录，只需引入layer.js即可，除jQuery外，其它文件无需再引入。
+二、如果您的js引入是通过合并处理或者您不想采用layer自动获取的绝对路径，您可以通过layer.config()来配置（详见官网API页）
+三、jQuery最低要求1.8
+四、更多使用说明与演示，请参见layer官网。
+五、请勿用于虚假诈骗、及违反我国法律的Web平台。这一点非常重要非常的重要！
+六、layer遵循LGPL协议，将永久性提供无偿服务。版权最终解释权：贤心。
+</pre>
+</div>
+
+<div class="box">
+  <h2 style="padding-bottom:20px;">扩展模块：图片查看器（相册层）</h2>
+  <div id="photosDemo" class="photos-demo">
+    <!-- layer-src表示大图  layer-pid表示图片id  src表示缩略图-->
+    
+    <img layer-src="http://static.oschina.net/uploads/space/2014/0516/012728_nAh8_1168184.jpg" layer-pid="" src="http://static.oschina.net/uploads/space/2014/0516/012728_nAh8_1168184.jpg" alt="layer宣传图">
+    <img layer-src="http://sentsin.qiniudn.com/sentsinmy5.jpg" layer-pid="" src="http://sentsin.qiniudn.com/sentsinmy5.jpg" alt="我入互联网这五年">
+    <img layer-src="" layer-pid="" src="http://sentsin.qiniudn.com/sentsin_39101a660cf4671b7ec297a74cc652c74152104f.jpg" alt="微摄影">
+    <img layer-src="http://sentsin.qiniudn.com/sentsinsan01.jpg" layer-pid="" src="http://sentsin.qiniudn.com/sentsinsan01.jpg" alt="三清山">
+    <img layer-src="http://ww2.sinaimg.cn/mw1024/5db11ff4jw1ehcyirr6quj20q00ex42w.jpg" layer-pid="" src="http://ww2.sinaimg.cn/mw1024/5db11ff4jw1ehcyirr6quj20q00ex42w.jpg" alt="国足">
+  </div>
+
+</div>
+
+
+<div class="box" style="text-align:center">
+  <a href="http://layer.layui.com/?form=local" target="_blank">更多示例</a>
+  <a href="http://layer.layui.com/api.html" target="_blank">使用文档</a>
+  <a href="http://fly.layui.com" target="_blank" title="Fly">交流反馈</a>
+  <a href="javascript:;" id="about">关于</a>
+</div>
+
+<script>
+;!function(){
+
+//页面一打开就执行，放入ready是为了layer所需配件（css、扩展模块）加载完毕
+layer.ready(function(){ 
+  //官网欢迎页
+  layer.open({
+    type: 2,
+    //skin: 'layui-layer-lan',
+    title: 'layer弹层组件',
+    fix: false,
+    shadeClose: true,
+    maxmin: true,
+    area: ['1000px', '500px'],
+    content: 'http://layer.layui.com/?form=local',
+    end: function(){
+      layer.tips('试试相册模块？', '#photosDemo', {tips: 1})
+    }
+  });
+  
+  //layer.msg('欢迎使用layer');
+  
+  //使用相册
+  layer.photos({
+    photos: '#photosDemo'
+  });
+});
+
+//关于
+$('#about').on('click', function(){
+  layer.alert(layer.v + ' - 贤心出品');
+});
+
+}();
+</script>
+</body>
+</html>
 \ No newline at end of file
+/*! layer-v2.4 弹层组件 License LGPL  http://layer.layui.com/ By 贤心 */
+;!function(a,b){"use strict";var c,d,e={getPath:function(){var a=document.scripts,b=a[a.length-1],c=b.src;if(!b.getAttribute("merge"))return c.substring(0,c.lastIndexOf("/")+1)}(),enter:function(a){13===a.keyCode&&a.preventDefault()},config:{},end:{},btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],type:["dialog","page","iframe","loading","tips"]},f={v:"2.4",ie6:!!a.ActiveXObject&&!a.XMLHttpRequest,index:0,path:e.getPath,config:function(a,b){var d=0;return a=a||{},f.cache=e.config=c.extend(e.config,a),f.path=e.config.path||f.path,"string"==typeof a.extend&&(a.extend=[a.extend]),f.use("skin/layer.css",a.extend&&a.extend.length>0?function g(){var c=a.extend;f.use(c[c[d]?d:d-1],d<c.length?function(){return++d,g}():b)}():b),this},use:function(a,b,d){var e=c("head")[0],a=a.replace(/\s/g,""),g=/\.css$/.test(a),h=document.createElement(g?"link":"script"),i="layui_layer_"+a.replace(/\.|\//g,"");return f.path?(g&&(h.rel="stylesheet"),h[g?"href":"src"]=/^http:\/\//.test(a)?a:f.path+a,h.id=i,c("#"+i)[0]||e.appendChild(h),function j(){(g?1989===parseInt(c("#"+i).css("width")):f[d||i])?function(){b&&b();try{g||e.removeChild(h)}catch(a){}}():setTimeout(j,100)}(),this):void 0},ready:function(a,b){var d="function"==typeof a;return d&&(b=a),f.config(c.extend(e.config,function(){return d?{}:{path:a}}()),b),this},alert:function(a,b,d){var e="function"==typeof b;return e&&(d=b),f.open(c.extend({content:a,yes:d},e?{}:b))},confirm:function(a,b,d,g){var h="function"==typeof b;return h&&(g=d,d=b),f.open(c.extend({content:a,btn:e.btn,yes:d,btn2:g},h?{}:b))},msg:function(a,d,g){var i="function"==typeof d,j=e.config.skin,k=(j?j+" "+j+"-msg":"")||"layui-layer-msg",l=h.anim.length-1;return i&&(g=d),f.open(c.extend({content:a,time:3e3,shade:!1,skin:k,title:!1,closeBtn:!1,btn:!1,end:g},i&&!e.config.skin?{skin:k+" layui-layer-hui",shift:l}:function(){return d=d||{},(-1===d.icon||d.icon===b&&!e.config.skin)&&(d.skin=k+" "+(d.skin||"layui-layer-hui")),d}()))},load:function(a,b){return f.open(c.extend({type:3,icon:a||0,shade:.01},b))},tips:function(a,b,d){return f.open(c.extend({type:4,content:[a,b],closeBtn:!1,time:3e3,shade:!1,fix:!1,maxWidth:210},d))}},g=function(a){var b=this;b.index=++f.index,b.config=c.extend({},b.config,e.config,a),b.creat()};g.pt=g.prototype;var h=["layui-layer",".layui-layer-title",".layui-layer-main",".layui-layer-dialog","layui-layer-iframe","layui-layer-content","layui-layer-btn","layui-layer-close"];h.anim=["layer-anim","layer-anim-01","layer-anim-02","layer-anim-03","layer-anim-04","layer-anim-05","layer-anim-06"],g.pt.config={type:0,shade:.3,fix:!0,move:h[1],title:"&#x4FE1;&#x606F;",offset:"auto",area:"auto",closeBtn:1,time:0,zIndex:19891014,maxWidth:360,shift:0,icon:-1,scrollbar:!0,tips:2},g.pt.vessel=function(a,b){var c=this,d=c.index,f=c.config,g=f.zIndex+d,i="object"==typeof f.title,j=f.maxmin&&(1===f.type||2===f.type),k=f.title?'<div class="layui-layer-title" style="'+(i?f.title[1]:"")+'">'+(i?f.title[0]:f.title)+"</div>":"";return f.zIndex=g,b([f.shade?'<div class="layui-layer-shade" id="layui-layer-shade'+d+'" times="'+d+'" style="'+("z-index:"+(g-1)+"; background-color:"+(f.shade[1]||"#000")+"; opacity:"+(f.shade[0]||f.shade)+"; filter:alpha(opacity="+(100*f.shade[0]||100*f.shade)+");")+'"></div>':"",'<div class="'+h[0]+(" layui-layer-"+e.type[f.type])+(0!=f.type&&2!=f.type||f.shade?"":" layui-layer-border")+" "+(f.skin||"")+'" id="'+h[0]+d+'" type="'+e.type[f.type]+'" times="'+d+'" showtime="'+f.time+'" conType="'+(a?"object":"string")+'" style="z-index: '+g+"; width:"+f.area[0]+";height:"+f.area[1]+(f.fix?"":";position:absolute;")+'">'+(a&&2!=f.type?"":k)+'<div id="'+(f.id||"")+'" class="layui-layer-content'+(0==f.type&&-1!==f.icon?" layui-layer-padding":"")+(3==f.type?" layui-layer-loading"+f.icon:"")+'">'+(0==f.type&&-1!==f.icon?'<i class="layui-layer-ico layui-layer-ico'+f.icon+'"></i>':"")+(1==f.type&&a?"":f.content||"")+'</div><span class="layui-layer-setwin">'+function(){var a=j?'<a class="layui-layer-min" href="javascript:;"><cite></cite></a><a class="layui-layer-ico layui-layer-max" href="javascript:;"></a>':"";return f.closeBtn&&(a+='<a class="layui-layer-ico '+h[7]+" "+h[7]+(f.title?f.closeBtn:4==f.type?"1":"2")+'" href="javascript:;"></a>'),a}()+"</span>"+(f.btn?function(){var a="";"string"==typeof f.btn&&(f.btn=[f.btn]);for(var b=0,c=f.btn.length;c>b;b++)a+='<a class="'+h[6]+b+'">'+f.btn[b]+"</a>";return'<div class="'+h[6]+'">'+a+"</div>"}():"")+"</div>"],k),c},g.pt.creat=function(){var a=this,b=a.config,g=a.index,i=b.content,j="object"==typeof i;if(!c("#"+b.id)[0]){switch("string"==typeof b.area&&(b.area="auto"===b.area?["",""]:[b.area,""]),b.type){case 0:b.btn="btn"in b?b.btn:e.btn[0],f.closeAll("dialog");break;case 2:var i=b.content=j?b.content:[b.content||"http://layer.layui.com","auto"];b.content='<iframe scrolling="'+(b.content[1]||"auto")+'" allowtransparency="true" id="'+h[4]+g+'" name="'+h[4]+g+'" onload="this.className=\'\';" class="layui-layer-load" frameborder="0" src="'+b.content[0]+'"></iframe>';break;case 3:b.title=!1,b.closeBtn=!1,-1===b.icon&&0===b.icon,f.closeAll("loading");break;case 4:j||(b.content=[b.content,"body"]),b.follow=b.content[1],b.content=b.content[0]+'<i class="layui-layer-TipsG"></i>',b.title=!1,b.tips="object"==typeof b.tips?b.tips:[b.tips,!0],b.tipsMore||f.closeAll("tips")}a.vessel(j,function(d,e){c("body").append(d[0]),j?function(){2==b.type||4==b.type?function(){c("body").append(d[1])}():function(){i.parents("."+h[0])[0]||(i.show().addClass("layui-layer-wrap").wrap(d[1]),c("#"+h[0]+g).find("."+h[5]).before(e))}()}():c("body").append(d[1]),a.layero=c("#"+h[0]+g),b.scrollbar||h.html.css("overflow","hidden").attr("layer-full",g)}).auto(g),2==b.type&&f.ie6&&a.layero.find("iframe").attr("src",i[0]),c(document).off("keydown",e.enter).on("keydown",e.enter),a.layero.on("keydown",function(a){c(document).off("keydown",e.enter)}),4==b.type?a.tips():a.offset(),b.fix&&d.on("resize",function(){a.offset(),(/^\d+%$/.test(b.area[0])||/^\d+%$/.test(b.area[1]))&&a.auto(g),4==b.type&&a.tips()}),b.time<=0||setTimeout(function(){f.close(a.index)},b.time),a.move().callback(),h.anim[b.shift]&&a.layero.addClass(h.anim[b.shift])}},g.pt.auto=function(a){function b(a){a=g.find(a),a.height(i[1]-j-k-2*(0|parseFloat(a.css("padding"))))}var e=this,f=e.config,g=c("#"+h[0]+a);""===f.area[0]&&f.maxWidth>0&&(/MSIE 7/.test(navigator.userAgent)&&f.btn&&g.width(g.innerWidth()),g.outerWidth()>f.maxWidth&&g.width(f.maxWidth));var i=[g.innerWidth(),g.innerHeight()],j=g.find(h[1]).outerHeight()||0,k=g.find("."+h[6]).outerHeight()||0;switch(f.type){case 2:b("iframe");break;default:""===f.area[1]?f.fix&&i[1]>=d.height()&&(i[1]=d.height(),b("."+h[5])):b("."+h[5])}return e},g.pt.offset=function(){var a=this,b=a.config,c=a.layero,e=[c.outerWidth(),c.outerHeight()],f="object"==typeof b.offset;a.offsetTop=(d.height()-e[1])/2,a.offsetLeft=(d.width()-e[0])/2,f?(a.offsetTop=b.offset[0],a.offsetLeft=b.offset[1]||a.offsetLeft):"auto"!==b.offset&&(a.offsetTop=b.offset,"rb"===b.offset&&(a.offsetTop=d.height()-e[1],a.offsetLeft=d.width()-e[0])),b.fix||(a.offsetTop=/%$/.test(a.offsetTop)?d.height()*parseFloat(a.offsetTop)/100:parseFloat(a.offsetTop),a.offsetLeft=/%$/.test(a.offsetLeft)?d.width()*parseFloat(a.offsetLeft)/100:parseFloat(a.offsetLeft),a.offsetTop+=d.scrollTop(),a.offsetLeft+=d.scrollLeft()),c.css({top:a.offsetTop,left:a.offsetLeft})},g.pt.tips=function(){var a=this,b=a.config,e=a.layero,f=[e.outerWidth(),e.outerHeight()],g=c(b.follow);g[0]||(g=c("body"));var i={width:g.outerWidth(),height:g.outerHeight(),top:g.offset().top,left:g.offset().left},j=e.find(".layui-layer-TipsG"),k=b.tips[0];b.tips[1]||j.remove(),i.autoLeft=function(){i.left+f[0]-d.width()>0?(i.tipLeft=i.left+i.width-f[0],j.css({right:12,left:"auto"})):i.tipLeft=i.left},i.where=[function(){i.autoLeft(),i.tipTop=i.top-f[1]-10,j.removeClass("layui-layer-TipsB").addClass("layui-layer-TipsT").css("border-right-color",b.tips[1])},function(){i.tipLeft=i.left+i.width+10,i.tipTop=i.top,j.removeClass("layui-layer-TipsL").addClass("layui-layer-TipsR").css("border-bottom-color",b.tips[1])},function(){i.autoLeft(),i.tipTop=i.top+i.height+10,j.removeClass("layui-layer-TipsT").addClass("layui-layer-TipsB").css("border-right-color",b.tips[1])},function(){i.tipLeft=i.left-f[0]-10,i.tipTop=i.top,j.removeClass("layui-layer-TipsR").addClass("layui-layer-TipsL").css("border-bottom-color",b.tips[1])}],i.where[k-1](),1===k?i.top-(d.scrollTop()+f[1]+16)<0&&i.where[2]():2===k?d.width()-(i.left+i.width+f[0]+16)>0||i.where[3]():3===k?i.top-d.scrollTop()+i.height+f[1]+16-d.height()>0&&i.where[0]():4===k&&f[0]+16-i.left>0&&i.where[1](),e.find("."+h[5]).css({"background-color":b.tips[1],"padding-right":b.closeBtn?"30px":""}),e.css({left:i.tipLeft-(b.fix?d.scrollLeft():0),top:i.tipTop-(b.fix?d.scrollTop():0)})},g.pt.move=function(){var a=this,b=a.config,e={setY:0,moveLayer:function(){var a=e.layero,b=parseInt(a.css("margin-left")),c=parseInt(e.move.css("left"));0===b||(c-=b),"fixed"!==a.css("position")&&(c-=a.parent().offset().left,e.setY=0),a.css({left:c,top:parseInt(e.move.css("top"))-e.setY})}},f=a.layero.find(b.move);return b.move&&f.attr("move","ok"),f.css({cursor:b.move?"move":"auto"}),c(b.move).on("mousedown",function(a){if(a.preventDefault(),"ok"===c(this).attr("move")){e.ismove=!0,e.layero=c(this).parents("."+h[0]);var f=e.layero.offset().left,g=e.layero.offset().top,i=e.layero.outerWidth()-6,j=e.layero.outerHeight()-6;c("#layui-layer-moves")[0]||c("body").append('<div id="layui-layer-moves" class="layui-layer-moves" style="left:'+f+"px; top:"+g+"px; width:"+i+"px; height:"+j+'px; z-index:2147483584"></div>'),e.move=c("#layui-layer-moves"),b.moveType&&e.move.css({visibility:"hidden"}),e.moveX=a.pageX-e.move.position().left,e.moveY=a.pageY-e.move.position().top,"fixed"!==e.layero.css("position")||(e.setY=d.scrollTop())}}),c(document).mousemove(function(a){if(e.ismove){var c=a.pageX-e.moveX,f=a.pageY-e.moveY;if(a.preventDefault(),!b.moveOut){e.setY=d.scrollTop();var g=d.width()-e.move.outerWidth(),h=e.setY;0>c&&(c=0),c>g&&(c=g),h>f&&(f=h),f>d.height()-e.move.outerHeight()+e.setY&&(f=d.height()-e.move.outerHeight()+e.setY)}e.move.css({left:c,top:f}),b.moveType&&e.moveLayer(),c=f=g=h=null}}).mouseup(function(){try{e.ismove&&(e.moveLayer(),e.move.remove(),b.moveEnd&&b.moveEnd()),e.ismove=!1}catch(a){e.ismove=!1}}),a},g.pt.callback=function(){function a(){var a=g.cancel&&g.cancel(b.index,d);a===!1||f.close(b.index)}var b=this,d=b.layero,g=b.config;b.openLayer(),g.success&&(2==g.type?d.find("iframe").on("load",function(){g.success(d,b.index)}):g.success(d,b.index)),f.ie6&&b.IE6(d),d.find("."+h[6]).children("a").on("click",function(){var a=c(this).index();if(0===a)g.yes?g.yes(b.index,d):g.btn1?g.btn1(b.index,d):f.close(b.index);else{var e=g["btn"+(a+1)]&&g["btn"+(a+1)](b.index,d);e===!1||f.close(b.index)}}),d.find("."+h[7]).on("click",a),g.shadeClose&&c("#layui-layer-shade"+b.index).on("click",function(){f.close(b.index)}),d.find(".layui-layer-min").on("click",function(){var a=g.min&&g.min(d);a===!1||f.min(b.index,g)}),d.find(".layui-layer-max").on("click",function(){c(this).hasClass("layui-layer-maxmin")?(f.restore(b.index),g.restore&&g.restore(d)):(f.full(b.index,g),setTimeout(function(){g.full&&g.full(d)},100))}),g.end&&(e.end[b.index]=g.end)},e.reselect=function(){c.each(c("select"),function(a,b){var d=c(this);d.parents("."+h[0])[0]||1==d.attr("layer")&&c("."+h[0]).length<1&&d.removeAttr("layer").show(),d=null})},g.pt.IE6=function(a){function b(){a.css({top:f+(e.config.fix?d.scrollTop():0)})}var e=this,f=a.offset().top;b(),d.scroll(b),c("select").each(function(a,b){var d=c(this);d.parents("."+h[0])[0]||"none"===d.css("display")||d.attr({layer:"1"}).hide(),d=null})},g.pt.openLayer=function(){var a=this;f.zIndex=a.config.zIndex,f.setTop=function(a){var b=function(){f.zIndex++,a.css("z-index",f.zIndex+1)};return f.zIndex=parseInt(a[0].style.zIndex),a.on("mousedown",b),f.zIndex}},e.record=function(a){var b=[a.width(),a.height(),a.position().top,a.position().left+parseFloat(a.css("margin-left"))];a.find(".layui-layer-max").addClass("layui-layer-maxmin"),a.attr({area:b})},e.rescollbar=function(a){h.html.attr("layer-full")==a&&(h.html[0].style.removeProperty?h.html[0].style.removeProperty("overflow"):h.html[0].style.removeAttribute("overflow"),h.html.removeAttr("layer-full"))},a.layer=f,f.getChildFrame=function(a,b){return b=b||c("."+h[4]).attr("times"),c("#"+h[0]+b).find("iframe").contents().find(a)},f.getFrameIndex=function(a){return c("#"+a).parents("."+h[4]).attr("times")},f.iframeAuto=function(a){if(a){var b=f.getChildFrame("html",a).outerHeight(),d=c("#"+h[0]+a),e=d.find(h[1]).outerHeight()||0,g=d.find("."+h[6]).outerHeight()||0;d.css({height:b+e+g}),d.find("iframe").css({height:b})}},f.iframeSrc=function(a,b){c("#"+h[0]+a).find("iframe").attr("src",b)},f.style=function(a,b){var d=c("#"+h[0]+a),f=d.attr("type"),g=d.find(h[1]).outerHeight()||0,i=d.find("."+h[6]).outerHeight()||0;(f===e.type[1]||f===e.type[2])&&(d.css(b),f===e.type[2]&&d.find("iframe").css({height:parseFloat(b.height)-g-i}))},f.min=function(a,b){var d=c("#"+h[0]+a),g=d.find(h[1]).outerHeight()||0;e.record(d),f.style(a,{width:180,height:g,overflow:"hidden"}),d.find(".layui-layer-min").hide(),"page"===d.attr("type")&&d.find(h[4]).hide(),e.rescollbar(a)},f.restore=function(a){var b=c("#"+h[0]+a),d=b.attr("area").split(",");b.attr("type");f.style(a,{width:parseFloat(d[0]),height:parseFloat(d[1]),top:parseFloat(d[2]),left:parseFloat(d[3]),overflow:"visible"}),b.find(".layui-layer-max").removeClass("layui-layer-maxmin"),b.find(".layui-layer-min").show(),"page"===b.attr("type")&&b.find(h[4]).show(),e.rescollbar(a)},f.full=function(a){var b,g=c("#"+h[0]+a);e.record(g),h.html.attr("layer-full")||h.html.css("overflow","hidden").attr("layer-full",a),clearTimeout(b),b=setTimeout(function(){var b="fixed"===g.css("position");f.style(a,{top:b?0:d.scrollTop(),left:b?0:d.scrollLeft(),width:d.width(),height:d.height()}),g.find(".layui-layer-min").hide()},100)},f.title=function(a,b){var d=c("#"+h[0]+(b||f.index)).find(h[1]);d.html(a)},f.close=function(a){var b=c("#"+h[0]+a),d=b.attr("type");if(b[0]){if(d===e.type[1]&&"object"===b.attr("conType")){b.children(":not(."+h[5]+")").remove();for(var g=0;2>g;g++)b.find(".layui-layer-wrap").unwrap().hide()}else{if(d===e.type[2])try{var i=c("#"+h[4]+a)[0];i.contentWindow.document.write(""),i.contentWindow.close(),b.find("."+h[5])[0].removeChild(i)}catch(j){}b[0].innerHTML="",b.remove()}c("#layui-layer-moves, #layui-layer-shade"+a).remove(),f.ie6&&e.reselect(),e.rescollbar(a),c(document).off("keydown",e.enter),"function"==typeof e.end[a]&&e.end[a](),delete e.end[a]}},f.closeAll=function(a){c.each(c("."+h[0]),function(){var b=c(this),d=a?b.attr("type")===a:1;d&&f.close(b.attr("times")),d=null})};var i=f.cache||{},j=function(a){return i.skin?" "+i.skin+" "+i.skin+"-"+a:""};f.prompt=function(a,b){a=a||{},"function"==typeof a&&(b=a);var d,e=2==a.formType?'<textarea class="layui-layer-input">'+(a.value||"")+"</textarea>":function(){return'<input type="'+(1==a.formType?"password":"text")+'" class="layui-layer-input" value="'+(a.value||"")+'">'}();return f.open(c.extend({btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],content:e,skin:"layui-layer-prompt"+j("prompt"),success:function(a){d=a.find(".layui-layer-input"),d.focus()},yes:function(c){var e=d.val();""===e?d.focus():e.length>(a.maxlength||500)?f.tips("&#x6700;&#x591A;&#x8F93;&#x5165;"+(a.maxlength||500)+"&#x4E2A;&#x5B57;&#x6570;",d,{tips:1}):b&&b(e,c,d)}},a))},f.tab=function(a){a=a||{};var b=a.tab||{};return f.open(c.extend({type:1,skin:"layui-layer-tab"+j("tab"),title:function(){var a=b.length,c=1,d="";if(a>0)for(d='<span class="layui-layer-tabnow">'+b[0].title+"</span>";a>c;c++)d+="<span>"+b[c].title+"</span>";return d}(),content:'<ul class="layui-layer-tabmain">'+function(){var a=b.length,c=1,d="";if(a>0)for(d='<li class="layui-layer-tabli xubox_tab_layer">'+(b[0].content||"no content")+"</li>";a>c;c++)d+='<li class="layui-layer-tabli">'+(b[c].content||"no  content")+"</li>";return d}()+"</ul>",success:function(b){var d=b.find(".layui-layer-title").children(),e=b.find(".layui-layer-tabmain").children();d.on("mousedown",function(b){b.stopPropagation?b.stopPropagation():b.cancelBubble=!0;var d=c(this),f=d.index();d.addClass("layui-layer-tabnow").siblings().removeClass("layui-layer-tabnow"),e.eq(f).show().siblings().hide(),"function"==typeof a.change&&a.change(f)})}},a))},f.photos=function(b,d,e){function g(a,b,c){var d=new Image;return d.src=a,d.complete?b(d):(d.onload=function(){d.onload=null,b(d)},void(d.onerror=function(a){d.onerror=null,c(a)}))}var h={};if(b=b||{},b.photos){var i=b.photos.constructor===Object,k=i?b.photos:{},l=k.data||[],m=k.start||0;if(h.imgIndex=(0|m)+1,b.img=b.img||"img",i){if(0===l.length)return f.msg("&#x6CA1;&#x6709;&#x56FE;&#x7247;")}else{var n=c(b.photos),o=function(){l=[],n.find(b.img).each(function(a){var b=c(this);b.attr("layer-index",a),l.push({alt:b.attr("alt"),pid:b.attr("layer-pid"),src:b.attr("layer-src")||b.attr("src"),thumb:b.attr("src")})})};if(o(),0===l.length)return;if(d||n.on("click",b.img,function(){var a=c(this),d=a.attr("layer-index");f.photos(c.extend(b,{photos:{start:d,data:l,tab:b.tab},full:b.full}),!0),o()}),!d)return}h.imgprev=function(a){h.imgIndex--,h.imgIndex<1&&(h.imgIndex=l.length),h.tabimg(a)},h.imgnext=function(a,b){h.imgIndex++,h.imgIndex>l.length&&(h.imgIndex=1,b)||h.tabimg(a)},h.keyup=function(a){if(!h.end){var b=a.keyCode;a.preventDefault(),37===b?h.imgprev(!0):39===b?h.imgnext(!0):27===b&&f.close(h.index)}},h.tabimg=function(a){l.length<=1||(k.start=h.imgIndex-1,f.close(h.index),f.photos(b,!0,a))},h.event=function(){h.bigimg.hover(function(){h.imgsee.show()},function(){h.imgsee.hide()}),h.bigimg.find(".layui-layer-imgprev").on("click",function(a){a.preventDefault(),h.imgprev()}),h.bigimg.find(".layui-layer-imgnext").on("click",function(a){a.preventDefault(),h.imgnext()}),c(document).on("keyup",h.keyup)},h.loadi=f.load(1,{shade:"shade"in b?!1:.9,scrollbar:!1}),g(l[m].src,function(d){f.close(h.loadi),h.index=f.open(c.extend({type:1,area:function(){var e=[d.width,d.height],f=[c(a).width()-50,c(a).height()-50];return!b.full&&e[0]>f[0]&&(e[0]=f[0],e[1]=e[0]*d.height/d.width),[e[0]+"px",e[1]+"px"]}(),title:!1,shade:.9,shadeClose:!0,closeBtn:!1,move:".layui-layer-phimg img",moveType:1,scrollbar:!1,moveOut:!0,shift:5*Math.random()|0,skin:"layui-layer-photos"+j("photos"),content:'<div class="layui-layer-phimg"><img src="'+l[m].src+'" alt="'+(l[m].alt||"")+'" layer-pid="'+l[m].pid+'"><div class="layui-layer-imgsee">'+(l.length>1?'<span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span>':"")+'<div class="layui-layer-imgbar" style="display:'+(e?"block":"")+'"><span class="layui-layer-imgtit"><a href="javascript:;">'+(l[m].alt||"")+"</a><em>"+h.imgIndex+"/"+l.length+"</em></span></div></div></div>",success:function(a,c){h.bigimg=a.find(".layui-layer-phimg"),h.imgsee=a.find(".layui-layer-imguide,.layui-layer-imgbar"),h.event(a),b.tab&&b.tab(l[m],a)},end:function(){h.end=!0,c(document).off("keyup",h.keyup)}},b))},function(){f.close(h.loadi),f.msg("&#x5F53;&#x524D;&#x56FE;&#x7247;&#x5730;&#x5740;&#x5F02;&#x5E38;<br>&#x662F;&#x5426;&#x7EE7;&#x7EED;&#x67E5;&#x770B;&#x4E0B;&#x4E00;&#x5F20;&#xFF1F;",{time:3e4,btn:["&#x4E0B;&#x4E00;&#x5F20;","&#x4E0D;&#x770B;&#x4E86;"],yes:function(){l.length>1&&h.imgnext(!0,!0)}})})}},e.run=function(){c=jQuery,d=c(a),h.html=c("html"),f.open=function(a){var b=new g(a);return b.index}},"function"==typeof define?define(function(){return e.run(),f}):function(){e.run(),f.use("skin/layer.css")}()}(window);
 \ No newline at end of file
+/*!
+ 
+ @Name: layer's style
+ @Author: 贤心
+ @Blog： sentsin.com
+ 
+ */.layui-layer-imgbar,.layui-layer-imgtit a,.layui-layer-tab .layui-layer-title span,.layui-layer-title{text-overflow:ellipsis;white-space:nowrap}*html{background-image:url(about:blank);background-attachment:fixed}html #layui_layer_skinlayercss{display:none;position:absolute;width:1989px}.layui-layer,.layui-layer-shade{position:fixed;_position:absolute;pointer-events:auto}.layui-layer-shade{top:0;left:0;width:100%;height:100%;_height:expression(document.body.offsetHeight+"px")}.layui-layer{-webkit-overflow-scrolling:touch;top:150px;left:0;margin:0;padding:0;background-color:#fff;-webkit-background-clip:content;box-shadow:1px 1px 50px rgba(0,0,0,.3);border-radius:2px;-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:.3s;animation-duration:.3s}.layui-layer-close{position:absolute}.layui-layer-content{position:relative}.layui-layer-border{border:1px solid #B2B2B2;border:1px solid rgba(0,0,0,.3);box-shadow:1px 1px 5px rgba(0,0,0,.2)}.layui-layer-moves{position:absolute;border:3px solid #666;border:3px solid rgba(0,0,0,.5);cursor:move;background-color:#fff;background-color:rgba(255,255,255,.3);filter:alpha(opacity=50)}.layui-layer-load{background:url(default/loading-0.gif) center center no-repeat #fff}.layui-layer-ico{background:url(default/icon.png) no-repeat}.layui-layer-btn a,.layui-layer-dialog .layui-layer-ico,.layui-layer-setwin a{display:inline-block;*display:inline;*zoom:1;vertical-align:top}@-webkit-keyframes bounceIn{0%{opacity:0;-webkit-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}@keyframes bounceIn{0%{opacity:0;-webkit-transform:scale(.5);-ms-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}}.layer-anim{-webkit-animation-name:bounceIn;animation-name:bounceIn}@-webkit-keyframes bounceOut{100%{opacity:0;-webkit-transform:scale(.7);transform:scale(.7)}30%{-webkit-transform:scale(1.03);transform:scale(1.03)}0%{-webkit-transform:scale(1);transform:scale(1)}}@keyframes bounceOut{100%{opacity:0;-webkit-transform:scale(.7);-ms-transform:scale(.7);transform:scale(.7)}30%{-webkit-transform:scale(1.03);-ms-transform:scale(1.03);transform:scale(1.03)}0%{-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}}.layer-anim-close{-webkit-animation-name:bounceOut;animation-name:bounceOut;-webkit-animation-duration:.2s;animation-duration:.2s}@-webkit-keyframes zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);-ms-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);-ms-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-01{-webkit-animation-name:zoomInDown;animation-name:zoomInDown}@-webkit-keyframes fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);-ms-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);-ms-transform:translateY(0);transform:translateY(0)}}.layer-anim-02{-webkit-animation-name:fadeInUpBig;animation-name:fadeInUpBig}@-webkit-keyframes zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);-ms-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);-ms-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-03{-webkit-animation-name:zoomInLeft;animation-name:zoomInLeft}@-webkit-keyframes rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0) rotate(0);transform:translateX(0) rotate(0)}}@keyframes rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);-ms-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0) rotate(0);-ms-transform:translateX(0) rotate(0);transform:translateX(0) rotate(0)}}.layer-anim-04{-webkit-animation-name:rollIn;animation-name:rollIn}@keyframes fadeIn{0%{opacity:0}100%{opacity:1}}.layer-anim-05{-webkit-animation-name:fadeIn;animation-name:fadeIn}@-webkit-keyframes shake{0%,100%{-webkit-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);transform:translateX(10px)}}@keyframes shake{0%,100%{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);-ms-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);-ms-transform:translateX(10px);transform:translateX(10px)}}.layer-anim-06{-webkit-animation-name:shake;animation-name:shake}@-webkit-keyframes fadeIn{0%{opacity:0}100%{opacity:1}}.layui-layer-title{padding:0 80px 0 20px;height:42px;line-height:42px;border-bottom:1px solid #eee;font-size:14px;color:#333;overflow:hidden;background-color:#F8F8F8;border-radius:2px 2px 0 0}.layui-layer-setwin{position:absolute;right:15px;*right:0;top:15px;font-size:0;line-height:initial}.layui-layer-setwin a{position:relative;width:16px;height:16px;margin-left:10px;font-size:12px;_overflow:hidden}.layui-layer-setwin .layui-layer-min cite{position:absolute;width:14px;height:2px;left:0;top:50%;margin-top:-1px;background-color:#2E2D3C;cursor:pointer;_overflow:hidden}.layui-layer-setwin .layui-layer-min:hover cite{background-color:#2D93CA}.layui-layer-setwin .layui-layer-max{background-position:-32px -40px}.layui-layer-setwin .layui-layer-max:hover{background-position:-16px -40px}.layui-layer-setwin .layui-layer-maxmin{background-position:-65px -40px}.layui-layer-setwin .layui-layer-maxmin:hover{background-position:-49px -40px}.layui-layer-setwin .layui-layer-close1{background-position:0 -40px;cursor:pointer}.layui-layer-setwin .layui-layer-close1:hover{opacity:.7}.layui-layer-setwin .layui-layer-close2{position:absolute;right:-28px;top:-28px;width:30px;height:30px;margin-left:0;background-position:-149px -31px;*right:-18px;_display:none}.layui-layer-setwin .layui-layer-close2:hover{background-position:-180px -31px}.layui-layer-btn{text-align:right;padding:0 10px 12px;pointer-events:auto}.layui-layer-btn a{height:28px;line-height:28px;margin:0 6px;padding:0 15px;border:1px solid #dedede;background-color:#f1f1f1;color:#333;border-radius:2px;font-weight:400;cursor:pointer;text-decoration:none}.layui-layer-btn a:hover{opacity:.9;text-decoration:none}.layui-layer-btn a:active{opacity:.7}.layui-layer-btn .layui-layer-btn0{border-color:#4898d5;background-color:#2e8ded;color:#fff}.layui-layer-dialog{min-width:260px}.layui-layer-dialog .layui-layer-content{position:relative;padding:20px;line-height:24px;word-break:break-all;overflow:hidden;font-size:14px;overflow-x:hidden;overflow-y:auto}.layui-layer-dialog .layui-layer-content .layui-layer-ico{position:absolute;top:16px;left:15px;_left:-40px;width:30px;height:30px}.layui-layer-ico1{background-position:-30px 0}.layui-layer-ico2{background-position:-60px 0}.layui-layer-ico3{background-position:-90px 0}.layui-layer-ico4{background-position:-120px 0}.layui-layer-ico5{background-position:-150px 0}.layui-layer-ico6{background-position:-180px 0}.layui-layer-rim{border:6px solid #8D8D8D;border:6px solid rgba(0,0,0,.3);border-radius:5px;box-shadow:none}.layui-layer-msg{min-width:180px;border:1px solid #D3D4D3;box-shadow:none}.layui-layer-hui{min-width:100px;background-color:#000;filter:alpha(opacity=60);background-color:rgba(0,0,0,.6);color:#fff;border:none}.layui-layer-hui .layui-layer-content{padding:12px 25px;text-align:center}.layui-layer-dialog .layui-layer-padding{padding:20px 20px 20px 55px;text-align:left}.layui-layer-page .layui-layer-content{position:relative;overflow:auto}.layui-layer-iframe .layui-layer-btn,.layui-layer-page .layui-layer-btn{padding-top:10px}.layui-layer-nobg{background:0 0}.layui-layer-iframe .layui-layer-content{overflow:hidden}.layui-layer-iframe iframe{display:block;width:100%}.layui-layer-loading{border-radius:100%;background:0 0;box-shadow:none;border:none}.layui-layer-loading .layui-layer-content{width:60px;height:24px;background:url(default/loading-0.gif) no-repeat}.layui-layer-loading .layui-layer-loading1{width:37px;height:37px;background:url(default/loading-1.gif) no-repeat}.layui-layer-ico16,.layui-layer-loading .layui-layer-loading2{width:32px;height:32px;background:url(default/loading-2.gif) no-repeat}.layui-layer-tips{background:0 0;box-shadow:none;border:none}.layui-layer-tips .layui-layer-content{position:relative;line-height:22px;min-width:12px;padding:5px 10px;font-size:12px;_float:left;border-radius:3px;box-shadow:1px 1px 3px rgba(0,0,0,.3);background-color:#F90;color:#fff}.layui-layer-tips .layui-layer-close{right:-2px;top:-1px}.layui-layer-tips i.layui-layer-TipsG{position:absolute;width:0;height:0;border-width:8px;border-color:transparent;border-style:dashed;*overflow:hidden}.layui-layer-tips i.layui-layer-TipsB,.layui-layer-tips i.layui-layer-TipsT{left:5px;border-right-style:solid;border-right-color:#F90}.layui-layer-tips i.layui-layer-TipsT{bottom:-8px}.layui-layer-tips i.layui-layer-TipsB{top:-8px}.layui-layer-tips i.layui-layer-TipsL,.layui-layer-tips i.layui-layer-TipsR{top:1px;border-bottom-style:solid;border-bottom-color:#F90}.layui-layer-tips i.layui-layer-TipsR{left:-8px}.layui-layer-tips i.layui-layer-TipsL{right:-8px}.layui-layer-lan[type=dialog]{min-width:280px}.layui-layer-lan .layui-layer-title{background:#4476A7;color:#fff;border:none}.layui-layer-lan .layui-layer-btn{padding:10px;text-align:right;border-top:1px solid #E9E7E7}.layui-layer-lan .layui-layer-btn a{background:#BBB5B5;border:none}.layui-layer-lan .layui-layer-btn .layui-layer-btn1{background:#C9C5C5}.layui-layer-molv .layui-layer-title{background:#009f95;color:#fff;border:none}.layui-layer-molv .layui-layer-btn a{background:#009f95}.layui-layer-molv .layui-layer-btn .layui-layer-btn1{background:#92B8B1}.layui-layer-iconext{background:url(default/icon-ext.png) no-repeat}.layui-layer-prompt .layui-layer-input{display:block;width:220px;height:30px;margin:0 auto;line-height:30px;padding:0 5px;border:1px solid #ccc;box-shadow:1px 1px 5px rgba(0,0,0,.1) inset;color:#333}.layui-layer-prompt textarea.layui-layer-input{width:300px;height:100px;line-height:20px}.layui-layer-tab{box-shadow:1px 1px 50px rgba(0,0,0,.4)}.layui-layer-tab .layui-layer-title{padding-left:0;border-bottom:1px solid #ccc;background-color:#eee;overflow:visible}.layui-layer-tab .layui-layer-title span{position:relative;float:left;min-width:80px;max-width:260px;padding:0 20px;text-align:center;cursor:default;overflow:hidden}.layui-layer-tab .layui-layer-title span.layui-layer-tabnow{height:43px;border-left:1px solid #ccc;border-right:1px solid #ccc;background-color:#fff;z-index:10}.layui-layer-tab .layui-layer-title span:first-child{border-left:none}.layui-layer-tabmain{line-height:24px;clear:both}.layui-layer-tabmain .layui-layer-tabli{display:none}.layui-layer-tabmain .layui-layer-tabli.xubox_tab_layer{display:block}.xubox_tabclose{position:absolute;right:10px;top:5px;cursor:pointer}.layui-layer-photos{-webkit-animation-duration:1s;animation-duration:1s}.layui-layer-photos .layui-layer-content{overflow:hidden;text-align:center}.layui-layer-photos .layui-layer-phimg img{position:relative;width:100%;display:inline-block;*display:inline;*zoom:1;vertical-align:top}.layui-layer-imgbar,.layui-layer-imguide{display:none}.layui-layer-imgnext,.layui-layer-imgprev{position:absolute;top:50%;width:27px;_width:44px;height:44px;margin-top:-22px;outline:0;blr:expression(this.onFocus=this.blur())}.layui-layer-imgprev{left:10px;background-position:-5px -5px;_background-position:-70px -5px}.layui-layer-imgprev:hover{background-position:-33px -5px;_background-position:-120px -5px}.layui-layer-imgnext{right:10px;_right:8px;background-position:-5px -50px;_background-position:-70px -50px}.layui-layer-imgnext:hover{background-position:-33px -50px;_background-position:-120px -50px}.layui-layer-imgbar{position:absolute;left:0;bottom:0;width:100%;height:32px;line-height:32px;background-color:rgba(0,0,0,.8);background-color:#000\9;filter:Alpha(opacity=80);color:#fff;overflow:hidden;font-size:0}.layui-layer-imgtit *{display:inline-block;*display:inline;*zoom:1;vertical-align:top;font-size:12px}.layui-layer-imgtit a{max-width:65%;overflow:hidden;color:#fff}.layui-layer-imgtit a:hover{color:#fff;text-decoration:underline}.layui-layer-imgtit em{padding-left:10px;font-style:normal}
 \ No newline at end of file
 [{000214A0-0000-0000-C000-000000000046}]
 Prop3=19,2
 [InternetShortcut]
-URL=http://code.jquery.com/jquery-1.9.1.min.js
+URL=http://layim.layui.com/
 IDList=
 HotKey=0
-（2.x对1.9+版本无缝兼容，可直接全文件覆盖升级。）
+（可直接全文件覆盖升级。）
+
+# v2.4（2016.07.03）
+* 兼容jQuery3.0
+* 优化tips，可支持配置参数fix（之前是强制fix: false），用于决定是固定的tips还是非固定的。
+* min回调可通过return false来设定不执行默认最小化。
+* 修复在移动端使用iframe，IOS下无法滑动的bug。
+* 细节优化及样式微调
+
+【2.3】2016.05.18
+1. 通过对使用频率的调查，将layer.ext.js（拓展模块）合并到了layer.js，即不用再通过layer.config来加载调用。
+2. cancel回调不再对第二个按钮有效，只作为右上角关闭按钮触发。并且除yes回调外，所以按钮的回调都可以通过return false来设定不默认关闭。
+3. 修复相册层，点击任意图片查看，弹出的并非当前图片的bug。
+4. 修复相册层在移动端显示不佳的bug。
+5. 修复msg、alert等对话框类型的弹层，在手机使用时未水平居中的bug。
+
 【2.2】2016.03.18
 > 增加参数id，用于控制弹层唯一标识。如不想重复弹出，可设置该值。
@@ -19,7 +19,7 @@
 <!-- MULTI-select 多选下拉框美化 -->
 <link href="/metronic_v4.5.4/plugins/jquery-multi-select/css/multi-select.css" rel="stylesheet" type="text/css" />
 <!-- METRONIC style -->
-<link href="/metronic_v4.5.4/layout4/css/themes/default.min.css" rel="stylesheet" type="text/css" id="style_color" />
+<link href="/metronic_v4.5.4/layout4/css/themes/light.min.css" rel="stylesheet" type="text/css" id="style_color" />
 <link href="/metronic_v4.5.4/css/components.css" rel="stylesheet" type="text/css" />
 <link href="/metronic_v4.5.4/css/plugins.css" rel="stylesheet" type="text/css" />
 <link href="/metronic_v4.5.4/layout4/css/layout.min.css" rel="stylesheet" type="text/css" />
@@ -28,7 +28,7 @@
 <link href="/metronic_v4.5.4/plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css" />
 <link href="/metronic_v4.5.4/plugins/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" />
 <!-- layer 弹层 插件 -->
-<link href="/assets/plugins/layer-v2.2/layer/skin/layer.css" rel="stylesheet" type="text/css" />
+<link href="/assets/plugins/layer-v2.4/layer/skin/layer.css" rel="stylesheet" type="text/css" />
 <!-- iCheck 单选框和复选框 -->
 <link href="/metronic_v4.5.4/plugins/icheck/skins/all.css" rel="stylesheet" type="text/css" />
 <!-- 日期控件 -->
@@ -237,6 +237,8 @@ tr.row-active td {
 <script src="/metronic_v4.5.4/plugins/jquery.min.js" data-exclude=1></script>
 <!-- bootstrap -->
 <script src="/metronic_v4.5.4/plugins/bootstrap/js/bootstrap.min.js" data-exclude=1></script>
+<script src="/pages/forms/statement/js/jquery.autocompleter.js"></script>
+<script src="/pages/forms/statement/js/jquery.PrintArea.js"></script>
 <!-- MTRONIC JS -->
 <script src="/metronic_v4.5.4/scripts/app.min.js" data-exclude=1></script>
 <script src="/metronic_v4.5.4/layout4/scripts/layout.min.js" data-exclude=1></script>
@@ -260,7 +262,7 @@ tr.row-active td {
 <!-- PJAX -->
 <script src="/assets/plugins/jquery.pjax.js"></script>
 <!-- layer 弹层 -->
-<script src="/assets/plugins/layer-v2.2/layer/layer.js" data-exclude=1></script>
+<script src="/assets/plugins/layer-v2.4/layer/layer.js" data-exclude=1></script>
 <!-- jquery.purl URL解析 -->
 <script src="/assets/plugins/purl.js"></script>
 <!-- jquery.serializejson JSON序列化插件 -->
@@ -291,6 +293,8 @@ tr.row-active td {
 <script src="/assets/js/dictionary.js"></script>
 <!-- d3 -->
 <script src="/assets/js/d3.min.js" data-exclude=1></script>
+<!-- webSocket JS -->
+<script src="/assets/js/sockjs.min.js"></script>
 <!-- TODO：angularJS相关库 -->