1.部分内容与浦交分支合并

王通
2 parents e1018ca6 d9f05c05
Showing 24 changed files with 2412 additions and 2075 deletions
pom.xml
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/controller/realcontrol/ServiceDataInterface.java
src/main/java/com/bsth/controller/schedule/TrafficManageController.java
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/entity/sys/SysUser.java
src/main/java/com/bsth/filter/BaseFilter.java
src/main/java/com/bsth/repository/sys/SysUserRepository.java
src/main/java/com/bsth/security/WebSecurityConfig.java
src/main/java/com/bsth/security/filter/LoginInterceptor.java
src/main/java/com/bsth/service/TrafficManageService.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
src/main/java/com/bsth/service/sys/SysUserService.java
src/main/java/com/bsth/service/sys/impl/PwdGenerator.java
src/main/java/com/bsth/service/sys/impl/SysUserServiceImpl.java
src/main/java/com/bsth/util/MailUtils.java
src/main/resources/application-dev.properties
@@ -181,27 +181,32 @@
  
 		<!-- pentaho kettle 依赖 -->
 		<dependency>
-			<groupId>com.pentaho.kettle</groupId>
+			<groupId>pentaho-kettle</groupId>
 			<artifactId>kettle-core</artifactId>
 			<version>6.0.1.0-386</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.xmlgraphics</groupId>
+                    <artifactId>batik-js</artifactId>
+                </exclusion>
+            </exclusions>
+		</dependency>
+		<dependency>
+			<groupId>pentaho-kettle</groupId>
+			<artifactId>kettle-engine</artifactId>
+			<version>6.0.1.0-386</version>
 		</dependency>
-        <dependency>
-            <groupId>com.pentaho.kettle</groupId>
-            <artifactId>kettle-engine</artifactId>
-            <version>6.0.1.0-386</version>
-        </dependency>
 		<dependency>
-			<groupId>com.pentaho.kettle</groupId>
+			<groupId>pentaho</groupId>
 			<artifactId>metastore</artifactId>
 			<version>6.0.1.0-386</version>
 		</dependency>
 		<dependency>
-			<groupId>com.pentaho.kettle</groupId>
-			<artifactId>vfs2</artifactId>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-vfs2</artifactId>
 			<version>2.1-20150824</version>
 		</dependency>
  
-
 		<dependency>
 			<groupId>net.sourceforge.jexcelapi</groupId>
 			<artifactId>jxl</artifactId>
@@ -291,12 +296,6 @@
  
  
 		<dependency>
-			<groupId>ojdbc</groupId>
-			<artifactId>ojdbc</artifactId>
-			<version>14</version>
-		</dependency>
-
-		<dependency>
 			<groupId>org.apache.mina</groupId>
 			<artifactId>mina-core</artifactId>
 			<version>2.0.13</version>
@@ -17,7 +17,7 @@ import java.util.concurrent.ScheduledExecutorService;
 @SpringBootApplication
 public class Application extends SpringBootServletInitializer {
  
-	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(18);
+	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(21);
  
 	@Override
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
@@ -97,8 +97,8 @@ public class XDApplication implements CommandLineRunner {
         timeDiff = (DateUtils.getTimestamp() + 1000 * 60 * 140) - System.currentTimeMillis();
         if (timeDiff < 0)
             timeDiff += (1000 * 60 * 60 * 24);
-        // 早上07:00
-        timeDiffTraffic = (DateUtils.getTimestamp() + 1000 * 60 * 60 * 7) - System.currentTimeMillis();
+        // 早上09:00
+        timeDiffTraffic = (DateUtils.getTimestamp() + 3600000 * 9) - System.currentTimeMillis();
         if (timeDiffTraffic < 0)
             timeDiffTraffic += (1000 * 60 * 60 * 24);
     }
@@ -120,6 +120,9 @@ public class XDApplication implements CommandLineRunner {
                 case "test":
                     testInit();
                     break;
+                case "cloud":
+                    cloudInit();
+                    break;
                 default:
                     break;
             }
@@ -266,4 +269,48 @@ public class XDApplication implements CommandLineRunner {
         //线路版本更新
         //sexec.scheduleWithFixedDelay(fixedEnableVerionsThread, 60 * 4, 60 * 2 , TimeUnit.SECONDS);
     }
+
+    public void cloudInit(){
+        log.info("cloudInit...");
+        ScheduledExecutorService sexec = Application.mainServices;
+        //安全驾驶
+        sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
+
+        GpsDataLoaderThread.setFlag(-1);
+        /** 线调业务 */
+        sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
+        sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 20, TimeUnit.SECONDS);//检查班次误点
+        sexec.scheduleWithFixedDelay(gpsDataLoader, 0, 2, TimeUnit.SECONDS);//抓取GPS数据
+        sexec.scheduleWithFixedDelay(rfidDataLoader, 5, 5, TimeUnit.SECONDS);//抓取RFID数据
+        sexec.scheduleWithFixedDelay(fixedCheckStationCodeThread, 60, 60 * 5, TimeUnit.SECONDS);//检查班次站点编码
+
+        sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线
+        sexec.scheduleWithFixedDelay(schedulePstThread, 180, 10, TimeUnit.SECONDS);//班次延迟入库线程
+        sexec.scheduleWithFixedDelay(seiPstThread, 180, 60, TimeUnit.SECONDS);//班次修正日志入库
+        sexec.scheduleWithFixedDelay(directivesPstThread, 120, 60, TimeUnit.SECONDS);//调度指令延迟入库
+        sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
+        sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据
+        sexec.scheduleWithFixedDelay(basicDataLoader, 1, 1, TimeUnit.HOURS);//基础数据更新
+        sexec.scheduleWithFixedDelay(autoExecScanThread, 180, 50, TimeUnit.SECONDS);//班次自动执行
+        DirectivePushQueue.start();//消息队列 -指令，系统下发的
+        WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
+
+        /** 线调为其他程序提供的数据 --写入数据库 */
+        sexec.scheduleWithFixedDelay(fcxxUpdateThread, 160, 30, TimeUnit.SECONDS);//发车信息（发车屏、信息发布）
+        //线路首末班数据（网关用，班次更新时写入）
+        //com.bsth.data.schedule.f_a_l.FirstAndLastHandler
+        sexec.scheduleWithFixedDelay(schSiginUpdateDBThread, 160, 60 * 30, TimeUnit.SECONDS);//无法自动完成的班次信息（网关用，补信号）
+
+        //运管处静态数据提交
+        log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处");
+        sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiffTraffic / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+        //计算油、公里加注
+        sexec.scheduleAtFixedRate(calcOilThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+
+        //线路版本更新
+        sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS);
+
+        //线路版本更新
+        //sexec.scheduleWithFixedDelay(fixedEnableVerionsThread, 60 * 4, 60 * 2 , TimeUnit.SECONDS);
+    }
 }
-package com.bsth.common;
-
-/**
- *
- * @ClassName: Constants
- * @Description: TODO(常量类)
- * @author PanZhao
- * @date 2016年3月18日 下午11:06:53
- *
- */
-public class Constants {
-
-	/**
-	 * 不需要拦截的资源
-	 */
-	public static final String LOGIN = "/user/login/**";
-	public static final String LOGIN_PAGE = "/login.html";
-	public static final String ASSETS_URL = "/assets/**";
-	public static final String FAVICON_URL = "/favicon.ico";
-	public static final String METRONIC_URL = "/metronic_v4.5.4/**";
-	public static final String LOGIN_FAILURE = "/user/loginFailure";
-	public static final String CAPTCHA = "/captcha.jpg";
-
-    // springboot manage health的检测url
-    public static final String ACTUATOR_MANAGEMENT_HEALTH = "/manage/health";
-    // 车辆数据同步url
-    public static final String VEHICLE_DATA_SYNC_URL = "/dataSync/vehicle/api/**";
-
-	//对外的营运数据接口
-	public static final String SERVICE_INTERFACE = "/companyService/**";
-
-	/**
-	 * 线调部分子页面不做拦截，便于浏览器缓存
-	 */
-	public static final String XD_CHILD_PAGES = "/real_control_v2/**";
-	public static final String XD_REAL_GPS = "/gps/real/line";
-	//public static final String XD_TEMPS = "/pages/control/line/temps/**";
-
-	//车载网关上行接口
-	public static final String UPSTREAM_URL = "/control/upstream";
-	//rfid 上传入口
-	public static final String UP_RFID_URL = "/rfid/**";
-
-	public static final String SESSION_USERNAME = "sessionUserName";
-	public static final String COMPANY_AUTHORITYS = "cmyAuths";
-	public static final String STATION_AND_SECTION_COUNT = "/station/updateStationAndSectionCode";
-
-	/**
-	 * 解除调度指令和班次的外键约束
-	 */
-	public static final String REMOVE_DIRECTIVE_SCH_FK = "update bsth_v_directive_60 set sch=NULL where sch=?";
-
-	/**
-	 * 批量解除调度指令和班次的外键约束
-	 */
-	public static final String MULTI_REMOVE_DIRECTIVE_SCH_FK = "update bsth_v_directive_60 set sch=NULL where sch in ";
-
-	/**
-	 * 批量解除子任务和班次的外键约束
-	 */
-	public static final String MULTI_REMOVE_CHILDTASK_SCH_FK = "update bsth_c_s_child_task set schedule=NULL where schedule in ";
-}
+package com.bsth.common;
+
+/**
+ *
+ * @ClassName: Constants
+ * @Description: TODO(常量类)
+ * @author PanZhao
+ * @date 2016年3月18日 下午11:06:53
+ *
+ */
+public class Constants {
+
+	/**
+	 * 不需要拦截的资源
+	 */
+	public static final String LOGIN = "/user/login/**";
+	public static final String LOGIN_PAGE = "/login.html";
+	public static final String ASSETS_URL = "/assets/**";
+	public static final String FAVICON_URL = "/favicon.ico";
+	public static final String METRONIC_URL = "/metronic_v4.5.4/**";
+	public static final String LOGIN_FAILURE = "/user/loginFailure";
+	public static final String CAPTCHA = "/captcha.jpg";
+
+    // springboot manage health的检测url
+    public static final String ACTUATOR_MANAGEMENT_HEALTH = "/manage/health";
+    // 车辆数据同步url
+    public static final String VEHICLE_DATA_SYNC_URL = "/dataSync/vehicle/api/**";
+
+	//对外的营运数据接口
+	public static final String SERVICE_INTERFACE = "/companyService/**";
+
+	/**
+	 * 线调部分子页面不做拦截，便于浏览器缓存
+	 */
+	public static final String XD_CHILD_PAGES = "/real_control_v2/**";
+	public static final String XD_REAL_GPS = "/gps/real/line";
+	//public static final String XD_TEMPS = "/pages/control/line/temps/**";
+
+	//车载网关上行接口
+	public static final String UPSTREAM_URL = "/control/upstream";
+	//rfid 上传入口
+	public static final String UP_RFID_URL = "/rfid/**";
+
+	public static final String SESSION_USERNAME = "sessionUserName";
+	public static final String COMPANY_AUTHORITYS = "cmyAuths";
+	public static final String STATION_AND_SECTION_COUNT = "/station/updateStationAndSectionCode";
+
+	/**
+	 * 解除调度指令和班次的外键约束
+	 */
+	public static final String REMOVE_DIRECTIVE_SCH_FK = "update bsth_v_directive_60 set sch=NULL where sch=?";
+
+	/**
+	 * 批量解除调度指令和班次的外键约束
+	 */
+	public static final String MULTI_REMOVE_DIRECTIVE_SCH_FK = "update bsth_v_directive_60 set sch=NULL where sch in ";
+
+	/**
+	 * 批量解除子任务和班次的外键约束
+	 */
+	public static final String MULTI_REMOVE_CHILDTASK_SCH_FK = "update bsth_c_s_child_task set schedule=NULL where schedule in ";
+
+	public static final String WEAK_CIPHER = "weakCipher";
+
+	public static final String FILE_AUTH = "/.well-known/pki-validation/fileauth.txt";
+}
@@ -345,8 +345,8 @@ public class ServiceDataInterface {
             for (Map.Entry<String, String> m : BasicData.lineCode2NameMap.entrySet()){
                 for (Map<String,String> emer : emergencyList){
                     for (Map.Entry<String,String> t : emer.entrySet()){
-                        if(m.getKey().equals(t.getKey())){
-                            emergencyListAll.add(emer); //
+                        if (m.getKey().equals(t.getKey())) {
+                            emergencyListAll.add(emer);
                             Line line = lineRepository.findById(Integer.parseInt(t.getKey())).get();
                             line.setName(t.getValue());
                             Map<String, Object> status = service.update(line);
-package com.bsth.controller.schedule;
-
-import com.bsth.service.TrafficManageService;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- *
- * @author BSTH
- *
- */
-@RestController
-@RequestMapping("trmg")
-public class TrafficManageController {
-
-    @Autowired
-    private TrafficManageService trManageService;
-
-
-    @RequestMapping(value = "/setXL", method = RequestMethod.GET)
-    public String setXL(@RequestParam("ids") String ids) throws Exception {
-        try {
-            return trManageService.setXL(ids);
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setXLByInUse", method = RequestMethod.GET)
-    public String setXLByInUse(@RequestParam("inUse") String inUse) throws Exception {
-        try {
-            return trManageService.setXLByInUse(inUse);
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setCL", method = RequestMethod.GET)
-    public String setCL() throws Exception {
-        try {
-            return trManageService.setCL();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setSJ", method = RequestMethod.GET)
-    public String setSJ() throws Exception {
-        try {
-            return trManageService.setSJ();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setLD", method = RequestMethod.GET)
-    public String setLD() throws Exception {
-        try {
-            return trManageService.setLD();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setLDByDate", method = RequestMethod.GET)
-    public String setLDByDate(@RequestParam("theDate") String theDate) throws Exception {
-        try {
-            return trManageService.setLD(theDate);
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setLDFile", method = RequestMethod.GET)
-    public String setLDFile() throws Exception {
-        try {
-            return trManageService.setLDFile();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setLCYH", method = RequestMethod.GET)
-    public String setLCYH() throws Exception {
-        try {
-            return trManageService.setLCYH();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setDDRB", method = RequestMethod.GET)
-    public String setDDRB() throws Exception {
-        try {
-            return trManageService.setDDRB();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setJHBC", method = RequestMethod.GET)
-    public String setJHBC() throws Exception {
-        try {
-            return trManageService.setJHBC();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setJHBCByDate", method = RequestMethod.GET)
-    public String setJHBCByDate(@RequestParam("theDate") String theDate) throws Exception {
-        try {
-            return trManageService.setJHBC(theDate);
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setSKB", method = RequestMethod.GET)
-    public String setSKB(@RequestParam("ids") String ids) throws Exception {
-        try {
-            return trManageService.setSKB(ids);
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setXLPC", method = RequestMethod.GET)
-    public String setXLPC() throws Exception {
-        try {
-            return trManageService.setXLPC();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setCS", method = RequestMethod.GET)
-    public String setCS() throws Exception {
-        try {
-            return trManageService.setCS();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/getDownLoadAllDataFile", method = RequestMethod.GET)
-    public String getDownLoadAllDataFile() throws Exception {
-        try {
-            return trManageService.getDownLoadAllDataFile();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-}
+package com.bsth.controller.schedule;
+
+import com.bsth.service.TrafficManageService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * @author BSTH
+ *
+ */
+@RestController
+@RequestMapping("trmg")
+public class TrafficManageController {
+
+    @Autowired
+    private TrafficManageService trManageService;
+
+
+    @RequestMapping(value = "/setXL", method = RequestMethod.GET)
+    public String setXL(@RequestParam("ids") String ids) throws Exception {
+        try {
+            return trManageService.setXL(ids);
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setXLByInUse", method = RequestMethod.GET)
+    public String setXLByInUse(@RequestParam("inUse") String inUse) throws Exception {
+        try {
+            return trManageService.setXLByInUse(inUse);
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setCL", method = RequestMethod.GET)
+    public String setCL() throws Exception {
+        try {
+            return trManageService.setCL();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setSJ", method = RequestMethod.GET)
+    public String setSJ() throws Exception {
+        try {
+            return trManageService.setSJ();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setLD", method = RequestMethod.GET)
+    public String setLD() throws Exception {
+        try {
+            return trManageService.setLD();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setLDByDate", method = RequestMethod.GET)
+    public String setLDByDate(@RequestParam("theDate") String theDate) throws Exception {
+        try {
+            return trManageService.setLD(theDate);
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setLDFile", method = RequestMethod.GET)
+    public String setLDFile() throws Exception {
+        try {
+            return trManageService.setLDFile();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setLCYH", method = RequestMethod.GET)
+    public String setLCYH() throws Exception {
+        try {
+            return trManageService.setLCYH();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setDDRB", method = RequestMethod.GET)
+    public String setDDRB() throws Exception {
+        try {
+            return trManageService.setDDRB();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setJHBC", method = RequestMethod.GET)
+    public String setJHBC() throws Exception {
+        try {
+            return trManageService.setJHBC();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setJHBCByDate", method = RequestMethod.GET)
+    public String setJHBCByDate(@RequestParam("theDate") String theDate) throws Exception {
+        try {
+            return trManageService.setJHBC(theDate);
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setSKB", method = RequestMethod.GET)
+    public String setSKB(@RequestParam("ids") String ids, @RequestParam("qyrqs") String qyrqs) throws Exception {
+        try {
+            return trManageService.setSKB(ids, qyrqs);
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setXLPC", method = RequestMethod.GET)
+    public String setXLPC() throws Exception {
+        try {
+            return trManageService.setXLPC();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setCS", method = RequestMethod.GET)
+    public String setCS() throws Exception {
+        try {
+            return trManageService.setCS();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/getDownLoadAllDataFile", method = RequestMethod.GET)
+    public String getDownLoadAllDataFile() throws Exception {
+        try {
+            return trManageService.getDownLoadAllDataFile();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+}
-package com.bsth.controller.sys;
-
-import com.bsth.common.Constants;
-import com.bsth.common.ResponseCode;
-import com.bsth.controller.BaseController;
-import com.bsth.controller.sys.dto.CompanyData;
-import com.bsth.controller.sys.util.RSAUtils;
-import com.bsth.entity.sys.CompanyAuthority;
-import com.bsth.entity.sys.SysUser;
-import com.bsth.security.util.SecurityUtils;
-import com.bsth.service.sys.CompanyAuthorityService;
-import com.bsth.service.sys.SysUserService;
-import com.google.common.collect.ArrayListMultimap;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.web.authentication.session.SessionAuthenticationException;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import java.util.*;
-
-@RestController
-@RequestMapping("user")
-public class UserController extends BaseController<SysUser, Integer> {
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Autowired
-    SysUserService sysUserService;
-
-    @Autowired
-    CompanyAuthorityService companyAuthorityService;
-
-    @RequestMapping(value = "/login/jCryptionKey")
-    public Map<String, Object> jCryptionKey(HttpServletRequest request) {
-        //公匙返回页面
-        Map<String, Object> rs = new HashMap<>();
-        rs.put("publickey", RSAUtils.generateBase64PublicKey());
-        return rs;
-    }
-
-    @RequestMapping(value = "/getCurrentUser")
-    public SysUser getCurrentUser() {
-        SysUser user = SecurityUtils.getCurrentUser();
-        return user;
-    }
-
-    //需要验证码的账号
-    public static Map<String, Integer> captchaMap = new HashMap<>();
-
-    @RequestMapping(value = "/login", method = RequestMethod.POST)
-    public Map<String, Object> login(HttpServletRequest request, @RequestParam String userName,
-                                     @RequestParam String password, String captcha) {
-
-        Map<String, Object> rs = new HashMap<>();
-        rs.put("status", ResponseCode.ERROR);
-        try {
-            HttpSession session = request.getSession();
-            rs.put("captcha", session.getAttribute("captcha"));
-
-            if (captchaMap.get(userName) != null && captchaMap.get(userName) >= 3) {
-                //校验验证码
-                String verCode = (String) session
-                        .getAttribute(com.google.code.kaptcha.Constants.KAPTCHA_SESSION_KEY);
-
-                if (StringUtils.isBlank(captcha))
-                    return put(rs, "msg", "请输入验证码");
-
-                if (!verCode.equals(captcha))
-                    return put(rs, "msg", "验证码有误，请刷新后重新输入");
-            }
-
-            //解密RSA
-            try {
-                userName = RSAUtils.decryptBase64(userName);
-                password = RSAUtils.decryptBase64(password);
-            } catch (RuntimeException e) {
-                return put(rs, "msg", "decrypt RSA fail！可能页面已过期，尝试刷新页面。");
-            }
-
-            SysUser user = sysUserService.findByUserName(userName);
-            if (null == user)
-                return put(rs, "msg", "不存在的用户");
-
-            if (!user.isEnabled())
-                return put(rs, "msg", "该用户已被锁定，请联系管理员");
-
-            // 校验密码
-            boolean matchStatus = new BCryptPasswordEncoder(4).matches(password, user.getPassword());
-            if (!matchStatus) {
-                rs.put("msg", "密码有误");
-
-                Integer captchSize = captchaMap.get(userName);
-                if (null == captchSize)
-                    captchSize = 0;
-
-                captchSize++;
-                captchaMap.put(userName, captchSize);
-                return rs;
-            }
-
-            // 登录
-            SecurityUtils.login(user, request);
-            //session里写入用户名，webSocket连接时标识身份用
-            session.setAttribute(Constants.SESSION_USERNAME, user.getUserName());
-
-            //获取公司权限数据
-            List<CompanyAuthority> cmyAuths = companyAuthorityService.findByUser(user);
-            session.setAttribute(Constants.COMPANY_AUTHORITYS, cmyAuths);
-
-            captchaMap.remove(userName);
-            rs.put("status", ResponseCode.SUCCESS);
-            logger.error("用户:" + user.getUserName() + "登录");
-        } catch (Exception e) {
-            logger.error("", e);
-            rs.put("msg", "服务器出现异常，请联系管理员");
-        }
-        return rs;
-    }
-
-    @RequestMapping(value = "/change_user", method = RequestMethod.POST)
-    public Map<String, Object> changeUser(HttpServletRequest request, @RequestParam String userName,
-                                          @RequestParam String password) {
-
-        Map<String, Object> rs = new HashMap<>();
-        rs.put("status", ResponseCode.ERROR);
-        try {
-            HttpSession session = request.getSession();
-
-            SysUser user = sysUserService.findByUserName(userName);
-            if (null == user)
-                return put(rs, "msg", "不存在的用户");
-
-            if (!user.isEnabled())
-                return put(rs, "msg", "该用户已被锁定，请联系管理员");
-
-            // 校验密码
-            boolean matchStatus = new BCryptPasswordEncoder(4).matches(password, user.getPassword());
-            if (!matchStatus)
-                return put(rs, "msg", "密码有误");
-
-            // 登录
-            SecurityUtils.login(user, request);
-            //session里写入用户名，webSocket连接时标识身份用
-            session.setAttribute(Constants.SESSION_USERNAME, user.getUserName());
-
-            //获取公司权限数据
-            List<CompanyAuthority> cmyAuths = companyAuthorityService.findByUser(user);
-            session.setAttribute(Constants.COMPANY_AUTHORITYS, cmyAuths);
-            rs.put("status", ResponseCode.SUCCESS);
-        } catch (Exception e) {
-            logger.error("", e);
-            rs.put("msg", "服务器出现异常，请联系管理员");
-        }
-        return rs;
-    }
-
-    /**
-     * 返回当前用户的公司权限数据，用于构建页面级联下拉框
-     *
-     * @return
-     */
-    @RequestMapping("companyData")
-    public List<CompanyData> companyData(HttpServletRequest request) {
-        List<CompanyData> rs = new ArrayList<>();
-        CompanyData companyData;
-
-        ArrayListMultimap<String, CompanyAuthority> map = ArrayListMultimap.create();
-        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) request.getSession().getAttribute(Constants.COMPANY_AUTHORITYS);
-
-        for (CompanyAuthority cAuth : cmyAuths) {
-            map.put(cAuth.getCompanyCode() + "_" + cAuth.getCompanyName(), cAuth);
-        }
-
-        Set<String> keys = map.keySet();
-        String[] temps;
-        for (String k : keys) {
-            temps = k.split("_");
-
-            companyData = new CompanyData();
-            companyData.setCompanyCode(temps[0]);
-            companyData.setCompanyName(temps[1]);
-            companyData.setChildren(new ArrayList<CompanyData.ChildrenCompany>());
-
-            cmyAuths = map.get(k);
-            for (CompanyAuthority c : cmyAuths) {
-                companyData.getChildren().add(new CompanyData.ChildrenCompany(c.getSubCompanyCode(), c.getSubCompanyName()));
-            }
-
-            rs.add(companyData);
-        }
-
-        return rs;
-    }
-
-    @RequestMapping(value = "/login/captchaStatus")
-    public int captchaStatus(String userName) {
-        Integer size = captchaMap.get(userName);
-        return size == null ? 0 : size;
-    }
-
-    public Map<String, Object> put(Map<String, Object> rs, String key, Object val) {
-        rs.put(key, val);
-        return rs;
-    }
-
-    /**
-     * @Title: loginFailure @Description: TODO(查询登录失败的详细信息) @param @param
-     * request @return String 返回类型 @throws
-     */
-    @RequestMapping("/loginFailure")
-    public String loginFailure(HttpServletRequest request) {
-        String msg = "";
-        HttpSession session = request.getSession();
-
-        Object obj = session.getAttribute("SPRING_SECURITY_LAST_EXCEPTION");
-
-        if (obj instanceof BadCredentialsException)
-            msg = "登录失败，用户名或密码错误.";
-        else if (obj instanceof SessionAuthenticationException)
-            msg = "登录失败，当前策略不允许重复登录.";
-        session.removeAttribute("SPRING_SECURITY_LAST_EXCEPTION");
-        return msg;
-    }
-
-    @RequestMapping("/currentUser")
-    public SysUser currentUser() {
-        return SecurityUtils.getCurrentUser();
-    }
-
-    /**
-     * @param id      用户ID
-     * @param enabled 状态
-     * @return
-     * @Title changeEnabled
-     * @Description: TODO(改变用户状态)
-     */
-    @RequestMapping("/changeEnabled")
-    public int changeEnabled(@RequestParam int id, @RequestParam int enabled) {
-        return sysUserService.changeEnabled(id, enabled);
-    }
-
-    /**
-     * @param oldPWD  原始密码
-     * @param newPWD  新密码
-     * @param cnewPWD 确认新密码
-     * @return
-     * @Title changePWD
-     * @Description: TODO(修改密码)
-     */
-    @RequestMapping(value = "/changePWD", method = RequestMethod.POST)
-    public String changePWD(@RequestParam String oldPWD, @RequestParam String newPWD, @RequestParam String cnewPWD) {
-        SysUser sysUser = SecurityUtils.getCurrentUser();
-        String msg = "";
-
-        //解密RSA
-        try{
-            oldPWD = (RSAUtils.decryptBase64(oldPWD));
-            newPWD = (RSAUtils.decryptBase64(newPWD));
-            cnewPWD = (RSAUtils.decryptBase64(cnewPWD));
-        }catch (RuntimeException e) {
-            return  "网络延迟，解密失败，请重新添加！";
-        }
-        if (new BCryptPasswordEncoder(4).matches(oldPWD, sysUser.getPassword())) {
-            if (oldPWD.equals(newPWD)) {
-                msg = "新密码不能跟原始密码一样！";
-            } else {
-                if (newPWD.equals(cnewPWD)) {
-                    sysUserService.changePWD(sysUser.getId(), newPWD);
-                    msg = "修改成功！";
-                } else {
-                    msg = "新密码两次输入不一致！";
-                }
-            }
-        } else {
-            msg = "原始密码错误！";
-        }
-        return msg;
-    }
-
-    @RequestMapping(value = "/register", method = RequestMethod.POST)
-    public Map<String, Object> register(SysUser u) {
-        return sysUserService.register(u);
-    }
-
-    // 查询用户下所有下级角色
-    @RequestMapping(value = "/all_distinct")
-    public List<SysUser> findAll_distinct() {
-        return sysUserService.findAll_distinct();
-    }
-
-    // 重置密码
-    @RequestMapping(value = "/resetPassword", method = RequestMethod.POST)
-    public Map<String, Object> resetPassword(@RequestParam Integer id) {
-        return sysUserService.resetPassword(id);
-    }
-
-}
+package com.bsth.controller.sys;
+
+import com.bsth.common.Constants;
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.BaseController;
+import com.bsth.controller.sys.dto.CompanyData;
+import com.bsth.controller.sys.util.RSAUtils;
+import com.bsth.email.entity.EmailBean;
+import com.bsth.entity.sys.CompanyAuthority;
+import com.bsth.entity.sys.Role;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
+import com.bsth.service.sys.CompanyAuthorityService;
+import com.bsth.service.sys.SysUserService;
+import com.bsth.service.sys.impl.PwdGenerator;
+import com.bsth.util.IpUtils;
+import com.google.common.collect.ArrayListMultimap;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.web.authentication.session.SessionAuthenticationException;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@RestController
+@RequestMapping("user")
+public class UserController extends BaseController<SysUser, Integer> {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    SysUserService sysUserService;
+
+    @Autowired
+    CompanyAuthorityService companyAuthorityService;
+
+    private Pattern pattern = Pattern.compile("^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*?[#?!@$%^&*-.]).{8,16}$");
+
+    @RequestMapping(value = "/login/jCryptionKey")
+    public Map<String, Object> jCryptionKey(HttpServletRequest request) {
+        //公匙返回页面
+        Map<String, Object> rs = new HashMap<>();
+        rs.put("publickey", RSAUtils.generateBase64PublicKey());
+        return rs;
+    }
+
+    @RequestMapping(value = "/getCurrentUser")
+    public SysUser getCurrentUser() {
+        SysUser user = SecurityUtils.getCurrentUser();
+        return user;
+    }
+
+    //需要验证码的账号
+    public static Map<String, Integer> USER_ERRTIMES = new HashMap<>();
+    public static Map<String, Long> USER_LOCKTIME = new HashMap<>();
+
+    @RequestMapping(value = "/login", method = RequestMethod.POST)
+    public Map<String, Object> login(HttpServletRequest request, @RequestParam String userName,
+                                     @RequestParam String password, String captcha) {
+
+        Map<String, Object> rs = new HashMap<>();
+        rs.put("status", ResponseCode.ERROR);
+        try {
+            HttpSession session = request.getSession();
+            rs.put("captcha", session.getAttribute("captcha"));
+
+            //解密RSA
+            try {
+                userName = RSAUtils.decryptBase64(userName);
+                password = RSAUtils.decryptBase64(password);
+            } catch (RuntimeException e) {
+                return put(rs, "msg", "decrypt RSA fail！可能页面已过期，尝试刷新页面。");
+            }
+
+            SysUser user = sysUserService.findByUserName(userName);
+
+            // 校验用户状态
+            if (!user.isEnabled()) {
+                return put(rs, "msg", "该用户已被锁定，请联系管理员");
+            }
+
+            // 校验临时状态
+            if (USER_LOCKTIME.get(userName) != null && USER_LOCKTIME.get(userName) >= System.currentTimeMillis()) {
+                return put(rs, "msg", "您的账户因密码错误次数过多，处于锁定状态中");
+            }
+
+            // 校验验证码
+            if (USER_ERRTIMES.get(userName) != null && USER_ERRTIMES.get(userName) > 1) {
+                String verCode = (String) session.getAttribute(com.google.code.kaptcha.Constants.KAPTCHA_SESSION_KEY);
+                if (StringUtils.isBlank(captcha)) {
+                    return put(rs, "msg", "请输入验证码");
+                }
+                if (!verCode.equals(captcha)) {
+                    return put(rs, "msg", "验证码有误，请刷新后重新输入");
+                }
+            }
+
+            // 校验密码
+            boolean matchStatus = new BCryptPasswordEncoder(4).matches(password, user.getPassword());
+            if (null == user || !matchStatus) {
+                rs.put("msg", "密码有误");
+
+                Integer errTimes = USER_ERRTIMES.get(userName);
+                if (null == errTimes) {
+                    errTimes = 0;
+                }
+                USER_ERRTIMES.put(userName, ++errTimes);
+                if (errTimes > 3) {
+                    USER_LOCKTIME.put(userName, System.currentTimeMillis() + 600000);
+                    USER_ERRTIMES.put(userName, 0);
+                    put(rs, "msg", "密码错误4次，账户将被锁定10分钟");
+                }
+
+                return rs;
+            }
+
+            // 弱密码检查
+            Matcher matcher = pattern.matcher(password);
+            if (!matcher.matches()) {
+                session.setAttribute(Constants.WEAK_CIPHER, 1);
+            }
+
+            // 登录
+            SecurityUtils.login(user, request);
+            sysUserService.recordLoginDate(userName);
+            //session里写入用户名，webSocket连接时标识身份用
+            session.setAttribute(Constants.SESSION_USERNAME, user.getUserName());
+
+            //获取公司权限数据
+            List<CompanyAuthority> cmyAuths = companyAuthorityService.findByUser(user);
+            session.setAttribute(Constants.COMPANY_AUTHORITYS, cmyAuths);
+
+            USER_ERRTIMES.remove(userName);
+            rs.put("status", ResponseCode.SUCCESS);
+            logger.error("用户:" + user.getUserName() + "登录");
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("msg", "服务器出现异常，请联系管理员");
+        }
+        return rs;
+    }
+
+    @RequestMapping(value = "/change_user", method = RequestMethod.POST)
+    public Map<String, Object> changeUser(HttpServletRequest request, @RequestParam String userName,
+                                          @RequestParam String password) {
+
+        Map<String, Object> rs = new HashMap<>();
+        rs.put("status", ResponseCode.ERROR);
+        try {
+            HttpSession session = request.getSession();
+
+            SysUser user = sysUserService.findByUserName(userName);
+            if (null == user)
+                return put(rs, "msg", "不存在的用户");
+
+            if (!user.isEnabled())
+                return put(rs, "msg", "该用户已被锁定，请联系管理员");
+
+            // 校验密码
+            boolean matchStatus = new BCryptPasswordEncoder(4).matches(password, user.getPassword());
+            if (!matchStatus)
+                return put(rs, "msg", "密码有误");
+
+            // 登录
+            SecurityUtils.login(user, request);
+            //session里写入用户名，webSocket连接时标识身份用
+            session.setAttribute(Constants.SESSION_USERNAME, user.getUserName());
+
+            //获取公司权限数据
+            List<CompanyAuthority> cmyAuths = companyAuthorityService.findByUser(user);
+            session.setAttribute(Constants.COMPANY_AUTHORITYS, cmyAuths);
+            rs.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("msg", "服务器出现异常，请联系管理员");
+        }
+        return rs;
+    }
+
+    /**
+     * 返回当前用户的公司权限数据，用于构建页面级联下拉框
+     *
+     * @return
+     */
+    @RequestMapping("companyData")
+    public List<CompanyData> companyData(HttpServletRequest request) {
+        List<CompanyData> rs = new ArrayList<>();
+        CompanyData companyData;
+
+        ArrayListMultimap<String, CompanyAuthority> map = ArrayListMultimap.create();
+        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) request.getSession().getAttribute(Constants.COMPANY_AUTHORITYS);
+
+        for (CompanyAuthority cAuth : cmyAuths) {
+            map.put(cAuth.getCompanyCode() + "_" + cAuth.getCompanyName(), cAuth);
+        }
+
+        Set<String> keys = map.keySet();
+        String[] temps;
+        for (String k : keys) {
+            temps = k.split("_");
+
+            companyData = new CompanyData();
+            companyData.setCompanyCode(temps[0]);
+            companyData.setCompanyName(temps[1]);
+            companyData.setChildren(new ArrayList<CompanyData.ChildrenCompany>());
+
+            cmyAuths = map.get(k);
+            for (CompanyAuthority c : cmyAuths) {
+                companyData.getChildren().add(new CompanyData.ChildrenCompany(c.getSubCompanyCode(), c.getSubCompanyName()));
+            }
+
+            rs.add(companyData);
+        }
+
+        return rs;
+    }
+
+    @RequestMapping(value = "/login/captchaStatus")
+    public int captchaStatus(String userName) {
+        Integer size = USER_ERRTIMES.get(userName);
+        return size == null ? 0 : size;
+    }
+
+    public Map<String, Object> put(Map<String, Object> rs, String key, Object val) {
+        rs.put(key, val);
+        return rs;
+    }
+
+    /**
+     * @Title: loginFailure @Description: TODO(查询登录失败的详细信息) @param @param
+     * request @return String 返回类型 @throws
+     */
+    @RequestMapping("/loginFailure")
+    public String loginFailure(HttpServletRequest request) {
+        String msg = "";
+        HttpSession session = request.getSession();
+
+        Object obj = session.getAttribute("SPRING_SECURITY_LAST_EXCEPTION");
+
+        if (obj instanceof BadCredentialsException)
+            msg = "登录失败，用户名或密码错误.";
+        else if (obj instanceof SessionAuthenticationException)
+            msg = "登录失败，当前策略不允许重复登录.";
+        session.removeAttribute("SPRING_SECURITY_LAST_EXCEPTION");
+        return msg;
+    }
+
+    @RequestMapping("/currentUser")
+    public SysUser currentUser() {
+        return SecurityUtils.getCurrentUser();
+    }
+
+    /**
+     * @param id      用户ID
+     * @param enabled 状态
+     * @return
+     * @Title changeEnabled
+     * @Description: TODO(改变用户状态)
+     */
+    @RequestMapping("/changeEnabled")
+    public int changeEnabled(@RequestParam int id, @RequestParam int enabled) {
+        return sysUserService.changeEnabled(id, enabled);
+    }
+
+    /**
+     * @param oldPWD  原始密码
+     * @param newPWD  新密码
+     * @param cnewPWD 确认新密码
+     * @return
+     * @Title changePWD
+     * @Description: TODO(修改密码)
+     */
+    @RequestMapping(value = "/changePWD", method = RequestMethod.POST)
+    public String changePWD(@RequestParam String oldPWD, @RequestParam String newPWD, @RequestParam String cnewPWD, HttpServletRequest request) {
+        SysUser sysUser = SecurityUtils.getCurrentUser();
+        String msg = "";
+
+        //解密RSA
+        try{
+            oldPWD = (RSAUtils.decryptBase64(oldPWD));
+            newPWD = (RSAUtils.decryptBase64(newPWD));
+            cnewPWD = (RSAUtils.decryptBase64(cnewPWD));
+        }catch (RuntimeException e) {
+            return  "网络延迟，解密失败，请重新添加！";
+        }
+        if (new BCryptPasswordEncoder(4).matches(oldPWD, sysUser.getPassword())) {
+            if (oldPWD.equals(newPWD)) {
+                msg = "新密码不能跟原始密码一样！";
+            } else {
+                if (newPWD.equals(cnewPWD)) {
+                    sysUserService.changePWD(sysUser.getId(), newPWD);
+                    request.getSession().setAttribute(Constants.WEAK_CIPHER, 0);
+                    msg = "修改成功！";
+                } else {
+                    msg = "新密码两次输入不一致！";
+                }
+            }
+        } else {
+            msg = "原始密码错误！";
+        }
+        return msg;
+    }
+
+    @RequestMapping(value = "/register", method = RequestMethod.POST)
+    public Map<String, Object> register(SysUser u) {
+        return sysUserService.register(u);
+    }
+
+    // 查询用户下所有下级角色
+    @RequestMapping(value = "/all_distinct")
+    public List<SysUser> findAll_distinct() {
+        return sysUserService.findAll_distinct();
+    }
+
+    // 重置密码
+    @RequestMapping(value = "/resetPassword", method = RequestMethod.POST)
+    public Map<String, Object> resetPassword(@RequestParam Integer id) {
+        return sysUserService.resetPassword(id);
+    }
+
+    /**
+     * 解除临时锁定
+     * @param userName
+     * @return
+     */
+    @RequestMapping(value = "/unlock", method = RequestMethod.POST)
+    public Map<String, Object> unlock(@RequestParam String userName) {
+        Map<String, Object> result = new HashMap<>();
+        // 获取当前用户
+        SysUser user = SecurityUtils.getCurrentUser();
+        Iterator<Role> itRole = user.getRoles().iterator();
+        Role ro = new Role();
+        boolean isSuper = false;
+        while (itRole.hasNext()) {//判断是否有下一个
+            ro = itRole.next();
+            if (ro.getLevel() == 1) {
+                isSuper = true;
+            }
+        }
+        if (isSuper) {
+            USER_LOCKTIME.remove(userName);
+            USER_ERRTIMES.remove(userName);
+            result.put("status", ResponseCode.SUCCESS);
+            result.put("msg", "用户解锁成功！");
+        } else {
+            result.put("status", ResponseCode.ERROR);
+            result.put("msg", "您不是管理员无用户解锁权限");
+        }
+
+        return result;
+    }
+
+    /**
+     * 解除临时锁定
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/isWeakCipher", method = RequestMethod.POST)
+    public Map<String, Object> isWeakCipher(HttpServletRequest request) {
+        Map<String, Object> result = new HashMap<>();
+        result.put("status", ResponseCode.SUCCESS);
+        result.put("data", request.getSession().getAttribute(Constants.WEAK_CIPHER));
+
+        return result;
+    }
+
+}
 package com.bsth.entity.sys;
  
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
  
 import javax.persistence.*;
@@ -25,13 +26,16 @@ public class SysUser implements Serializable {
 	private String userName;
  
 	private String name;
-	
+
+	@JsonIgnore
 	private String password;
  
 	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
 	private Date createDate;
+
+	@Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+	private Date updateDate;
  
-	@Column(name = "last_loginDate", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
 	private Date lastLoginDate;
  
 	private String agencies;
@@ -74,6 +78,14 @@ public class SysUser implements Serializable {
 		this.createDate = createDate;
 	}
  
+	public Date getUpdateDate() {
+		return updateDate;
+	}
+
+	public void setUpdateDate(Date updateDate) {
+		this.updateDate = updateDate;
+	}
+
 	public Date getLastLoginDate() {
 		return lastLoginDate;
 	}
-package com.bsth.filter;
-
-import com.bsth.common.Constants;
-import org.springframework.util.AntPathMatcher;
-import org.springframework.util.PathMatcher;
-
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-public abstract class BaseFilter implements Filter {
-
-	private final PathMatcher pathMatcher = new AntPathMatcher();
-
-	/**
-	 * 白名单
-	 */
-	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
-			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL, Constants.STATION_AND_SECTION_COUNT, Constants.ACTUATOR_MANAGEMENT_HEALTH,
-            Constants.VEHICLE_DATA_SYNC_URL };
-
-	@Override
-	public void destroy() {
-
-	}
-
-	@Override
-	public void doFilter(ServletRequest request, ServletResponse response,
-			FilterChain chain) throws IOException, ServletException {
-
-		HttpServletRequest httpRequest = (HttpServletRequest) request;
-		HttpServletResponse httpResponse = (HttpServletResponse) response;
-
-		String currentURL = httpRequest.getServletPath();
-
-		if (isWhiteURL(currentURL)) {
-			chain.doFilter(request, response);
-			return;
-		}
-
-		doFilter(httpRequest, httpResponse, chain);
-		return;
-	}
-
-	public void doFilter(HttpServletRequest request,
-			HttpServletResponse response, FilterChain chain)
-			throws IOException, ServletException {
-		chain.doFilter(request, response);
-	}
-
-	@Override
-	public void init(FilterConfig arg0) throws ServletException {
-
-	}
-
-	private boolean isWhiteURL(String currentURL) {
-		for (String whiteURL : whiteListURLs) {
-			if (pathMatcher.match(whiteURL, currentURL)) {
-				return true;
-			}
-		}
-		return false;
-	}
-}
+package com.bsth.filter;
+
+import com.bsth.common.Constants;
+import org.springframework.util.AntPathMatcher;
+import org.springframework.util.PathMatcher;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public abstract class BaseFilter implements Filter {
+
+	private final PathMatcher pathMatcher = new AntPathMatcher();
+
+	/**
+	 * 白名单
+	 */
+	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
+			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE,
+			Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL,
+			Constants.STATION_AND_SECTION_COUNT, Constants.ACTUATOR_MANAGEMENT_HEALTH, Constants.VEHICLE_DATA_SYNC_URL,
+			Constants.FILE_AUTH};
+
+	@Override
+	public void destroy() {
+
+	}
+
+	@Override
+	public void doFilter(ServletRequest request, ServletResponse response,
+			FilterChain chain) throws IOException, ServletException {
+
+		HttpServletRequest httpRequest = (HttpServletRequest) request;
+		HttpServletResponse httpResponse = (HttpServletResponse) response;
+
+		String currentURL = httpRequest.getServletPath();
+
+		if (isWhiteURL(currentURL)) {
+			chain.doFilter(request, response);
+			return;
+		}
+
+		doFilter(httpRequest, httpResponse, chain);
+		return;
+	}
+
+	public void doFilter(HttpServletRequest request,
+			HttpServletResponse response, FilterChain chain)
+			throws IOException, ServletException {
+		chain.doFilter(request, response);
+	}
+
+	@Override
+	public void init(FilterConfig arg0) throws ServletException {
+
+	}
+
+	private boolean isWhiteURL(String currentURL) {
+		for (String whiteURL : whiteListURLs) {
+			if (pathMatcher.match(whiteURL, currentURL)) {
+				return true;
+			}
+		}
+		return false;
+	}
+}
-package com.bsth.repository.sys;
-
-import com.bsth.entity.sys.SysUser;
-import com.bsth.repository.BaseRepository;
-import org.springframework.data.jpa.repository.EntityGraph;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-@Repository
-public interface SysUserRepository extends BaseRepository<SysUser, Integer>{
-
-	SysUser findByUserName(String userName);
-
-	@Transactional
-	@Modifying
-	@Query(value="update bsth_c_sys_user set enabled=?2 where id=?1",nativeQuery=true)
-	int changeEnabled(int id,int enabled);
-	
-	@Transactional
-	@Modifying
-	@Query(value="update bsth_c_sys_user set password=?2 where id=?1",nativeQuery=true)
-	int changePWD(int id,String newPWD);
-
-	@EntityGraph(value = "sysUser_role", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value = "select DISTINCT u from SysUser u")
-	List<SysUser> findAll_distinct();
-}
+package com.bsth.repository.sys;
+
+import com.bsth.entity.sys.SysUser;
+import com.bsth.repository.BaseRepository;
+import org.springframework.data.jpa.repository.EntityGraph;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Repository
+public interface SysUserRepository extends BaseRepository<SysUser, Integer>{
+
+	SysUser findByUserName(String userName);
+
+	@Transactional
+	@Modifying
+	@Query(value="update bsth_c_sys_user set enabled=?2 where id=?1",nativeQuery=true)
+	int changeEnabled(int id,int enabled);
+	
+	@Transactional
+	@Modifying
+	@Query(value="update bsth_c_sys_user set password=?2 where id=?1",nativeQuery=true)
+	int changePWD(int id,String newPWD);
+
+	@EntityGraph(value = "sysUser_role", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value = "select DISTINCT u from SysUser u")
+	List<SysUser> findAll_distinct();
+
+	@Modifying
+	@Query(value="update bsth_c_sys_user set last_login_date=now() where user_name=?1",nativeQuery=true)
+	void recordLoginDate(String userName);
+}
@@ -38,7 +38,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     public void configure(WebSecurity web) throws Exception {
         // 白名单
         web.ignoring().antMatchers(Constants.LOGIN_PAGE, Constants.LOGIN, Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.CAPTCHA,
-                Constants.SERVICE_INTERFACE, Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL,Constants.STATION_AND_SECTION_COUNT);
+                Constants.SERVICE_INTERFACE, Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES,
+                Constants.UP_RFID_URL, Constants.STATION_AND_SECTION_COUNT, Constants.FILE_AUTH);
     }
  
     @Override
@@ -33,8 +33,9 @@ public class LoginInterceptor implements Filter {
 	 * 相比于 BaseFilter，此处对线调GPS请求进行了拦截验证
 	 */
 	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
-			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL,Constants.STATION_AND_SECTION_COUNT,
-            Constants.VEHICLE_DATA_SYNC_URL };
+			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN,
+			Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL,
+			Constants.STATION_AND_SECTION_COUNT, Constants.VEHICLE_DATA_SYNC_URL, Constants.FILE_AUTH };
  
  
 	@Override
-package com.bsth.service;
-
-/**
- *
- * @Interface: LineService(线路service业务层实现接口)
- *
- * @extends : BaseService
- *
- * @Description: TODO(线路service业务层实现接口)
- *
- * @Author bsth@lq
- *
- * @Date 2016年4月28日 上午9:21:17
- *
- * @Version 公交调度系统BS版 0.1
- *
- */
-public interface TrafficManageService {
-
-	/**
-	 * 上传线路信息
-	 *
-	 * @return 调用接口返回信息
-	 */
-	String setXL(String ids);
-
-	/**
-	 * 上传线路信息
-	 *
-	 * @return 调用接口返回信息
-	 */
-	String setXLByInUse(String ids);
-
-	/**
-	 * 上传车辆信息
-	 *
-	 * @return 调用接口返回信息
-	 */
-	String setCL();
-
-	/**
-	 * 上传司机信息
-	 * @return 调用接口返回信息
-	 */
-	String setSJ();
-
-	/**
-	 * 上传超速数据
-	 *
-	 * @return 调用接口返回信息
-	 */
-	String setCS();
-
-	/**
-	 * 上传线路班次时刻表数据
-	 *
-	 * @return 调用接口返回信息
-	 */
-	String setSKB(String ids);
-
-	/**
-	 * 线路人员车辆配置信息
-	 * @return 调用接口返回信息
-	 */
-	String setXLPC();
-
-	/**
-	 * 线路计划班次表
-	 * @return 调用接口返回信息
-	 */
-	String setJHBC();
-
-	String setJHBC(String theDate);
-
-	String setLD(String theDate);
-
-	String setLD();
-
-	String setLDFile();
-
-	String setLCYH();
-
-	String setDDRB();
-
-	/**
-	 * 下载全量的公交基础数据
-	 * @return
-	 */
-	String getDownLoadAllDataFile();
-
-	/**
-	 * 下载增量的公交基础数据
-	 * @return
-	 */
-	String getDownLoadIncreaseDataFile();
-
-	/**
-	 * 指定线路查询方式公交基础数据下载
-	 * @return
-	 */
-	String getDownLoadWarrantsBusLineStation();
-}
+package com.bsth.service;
+
+/**
+ *
+ * @Interface: LineService(线路service业务层实现接口)
+ *
+ * @extends : BaseService
+ *
+ * @Description: TODO(线路service业务层实现接口)
+ *
+ * @Author bsth@lq
+ *
+ * @Date 2016年4月28日 上午9:21:17
+ *
+ * @Version 公交调度系统BS版 0.1
+ *
+ */
+public interface TrafficManageService {
+
+	/**
+	 * 上传线路信息
+	 *
+	 * @return 调用接口返回信息
+	 */
+	String setXL(String ids);
+
+	/**
+	 * 上传线路信息
+	 *
+	 * @return 调用接口返回信息
+	 */
+	String setXLByInUse(String ids);
+
+	/**
+	 * 上传车辆信息
+	 *
+	 * @return 调用接口返回信息
+	 */
+	String setCL();
+
+	/**
+	 * 上传司机信息
+	 * @return 调用接口返回信息
+	 */
+	String setSJ();
+
+	/**
+	 * 上传超速数据
+	 *
+	 * @return 调用接口返回信息
+	 */
+	String setCS();
+
+	/**
+	 * 上传线路班次时刻表数据
+	 *
+	 * @return 调用接口返回信息
+	 */
+	String setSKB(String ids, String qyrqs);
+
+	/**
+	 * 线路人员车辆配置信息
+	 * @return 调用接口返回信息
+	 */
+	String setXLPC();
+
+	/**
+	 * 线路计划班次表
+	 * @return 调用接口返回信息
+	 */
+	String setJHBC();
+
+	String setJHBC(String theDate);
+
+	String setLD(String theDate);
+
+	String setLD();
+
+	String setLDFile();
+
+	String setLCYH();
+
+	String setDDRB();
+
+	/**
+	 * 下载全量的公交基础数据
+	 * @return
+	 */
+	String getDownLoadAllDataFile();
+
+	/**
+	 * 下载增量的公交基础数据
+	 * @return
+	 */
+	String getDownLoadIncreaseDataFile();
+
+	/**
+	 * 指定线路查询方式公交基础数据下载
+	 * @return
+	 */
+	String getDownLoadWarrantsBusLineStation();
+}
@@ -19,7 +19,6 @@ import com.bsth.repository.traffic.SKBUploadLoggerRepository;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.TrafficManageService;
 import com.bsth.service.traffic.YgcBasicDataService;
-import com.bsth.util.IpUtils;
 import com.bsth.util.TimeUtils;
 import com.bsth.util.db.DBUtils_MS;
 import com.bsth.webService.trafficManage.org.tempuri.Results;
@@ -529,7 +528,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			try {
 				//发送邮件
 				EmailBean mail = new EmailBean();
-				mail.setSubject(IpUtils.getLocalIpAddress() +":路单日志数据"+date);
+				mail.setSubject(InetAddress.getLocalHost().getHostAddress()+":路单日志数据"+date);
 				mail.setContent("总数：" + (listGroup == null ? 0 : listGroup.size()) + "<br/>成功数：" + scount + "<br/>跳过数：" + ccount + "<br/>耗时：" + (System.currentTimeMillis() - start));
 				sendEmailController.sendMail(emailSendToAddress, mail);
 				logger.info("setLD-sendMail:邮件发送成功！");
@@ -1474,8 +1473,6 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			company = "浦东南汇公交公司";
 		}else if(company.equals("青浦公交")){
 			company = "浦东青浦公交公司";
-		}else if(company.equals("临港公交")){
-			company = "临港公交公司";
 		}
 	}
 	/**
@@ -205,7 +205,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
  
         session.fireAllRules();
  
-        session.dispose();;
+        session.dispose();
  
         return result;
     }
-package com.bsth.service.sys;
-
-import com.bsth.entity.sys.SysUser;
-import com.bsth.service.BaseService;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
-import java.util.Map;
-
-public interface SysUserService extends BaseService<SysUser, Integer>{
-	
-	SysUser findByUserName(String name);
-	
-	int changeEnabled(int id,int enabled);
-	
-	int changePWD(int id,String newPWD);
-
-	Map<String,Object> register(SysUser u);
-
-	List<SysUser> findAll_distinct();
-
-	Map<String, Object> resetPassword(@RequestParam Integer id);
-}
+package com.bsth.service.sys;
+
+import com.bsth.entity.sys.SysUser;
+import com.bsth.service.BaseService;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+import java.util.Map;
+
+public interface SysUserService extends BaseService<SysUser, Integer>{
+	
+	SysUser findByUserName(String name);
+	
+	int changeEnabled(int id,int enabled);
+	
+	int changePWD(int id,String newPWD);
+
+	Map<String,Object> register(SysUser u);
+
+	List<SysUser> findAll_distinct();
+
+	Map<String, Object> resetPassword(@RequestParam Integer id);
+
+	void recordLoginDate(String userName);
+}
+package com.bsth.service.sys.impl;
+
+import java.util.Random;
+
+public class PwdGenerator {
+    private static final String SPECIAL_CHARS = "!@#$%^&*_=+-/";
+
+    /**
+     * 查找一个char数组中还没有填充字符的位置
+     */
+    private static int nextIndex(char[] chars, Random rnd) {
+        int index = rnd.nextInt(chars.length);
+        while (chars[index] != 0) {
+            index = rnd.nextInt(chars.length);
+        }
+        return index;
+    }
+
+    /**
+     * 返回一个随机的特殊字符
+     */
+    private static char nextSpecialChar(Random rnd) {
+        return SPECIAL_CHARS.charAt(rnd.nextInt(SPECIAL_CHARS.length()));
+    }
+
+    /**
+     * 返回一个随机的大写字母
+     */
+    private static char nextUpperLetter(Random rnd) {
+        return (char) ('A' + rnd.nextInt(26));
+    }
+
+    /**
+     * 返回一个随机的小写字母
+     */
+    private static char nextLowerLetter(Random rnd) {
+        return (char) ('a' + rnd.nextInt(26));
+    }
+
+    /**
+     * 返回一个随机的数字
+     */
+    private static char nextNumLetter(Random rnd) {
+        return (char) ('0' + rnd.nextInt(10));
+    }
+
+    /**
+     * 返回一个随机的字符
+     */
+    private static char nextChar(Random rnd) {
+        switch (rnd.nextInt(4)) {
+            case 0:
+                return (char) ('a' + rnd.nextInt(26));
+            case 1:
+                return (char) ('A' + rnd.nextInt(26));
+            case 2:
+                return (char) ('0' + rnd.nextInt(10));
+            default:
+                return SPECIAL_CHARS.charAt(rnd.nextInt(SPECIAL_CHARS.length()));
+        }
+    }
+
+    /**
+     * 生成指定位数的随机数
+     */
+    public static String randomPassword(int length) {
+        if(length < 3){
+            return "";
+        }
+        char[] chars = new char[length];
+        Random rnd = new Random();
+
+        //1. 至少生成一个大写字母、小写字母、特殊字符、数字
+        chars[nextIndex(chars, rnd)] = nextUpperLetter(rnd);
+        chars[nextIndex(chars, rnd)] = nextLowerLetter(rnd);
+        chars[nextIndex(chars, rnd)] = nextNumLetter(rnd);
+
+        //2. 填补其他位置的字符
+        for (int i = 0; i < length; i++) {
+            if (chars[i] == 0) {
+                chars[i] = nextChar(rnd);
+            }
+        }
+
+        //3. 返回结果
+        return new String(chars);
+    }
+
+
+    /**
+     * 测试代码
+     */
+    public static void main(String[] args) {
+        for (int i = 0; i < 10; i++) {
+            System.out.println(randomPassword(16));
+        }
+
+    }
+
+}
@@ -2,6 +2,8 @@ package com.bsth.service.sys.impl;
  
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.sys.util.RSAUtils;
+import com.bsth.email.SendEmailController;
+import com.bsth.email.entity.EmailBean;
 import com.bsth.entity.sys.Role;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.sys.SysUserRepository;
@@ -9,6 +11,8 @@ import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.sys.RoleService;
 import com.bsth.service.sys.SysUserService;
+import com.bsth.util.IpUtils;
+import com.bsth.util.MailUtils;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import org.slf4j.Logger;
@@ -16,6 +20,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestParam;
  
 import java.util.ArrayList;
@@ -33,6 +38,10 @@ public class SysUserServiceImpl extends BaseServiceImpl&lt;SysUser, Integer&gt; implem
 	@Autowired
 	RoleService roleService;
  
+	// 发送邮件
+	@Autowired
+	private MailUtils mailUtils;
+
 	Logger logger = LoggerFactory.getLogger(this.getClass());
  
 	@Override
@@ -166,12 +175,19 @@ public class SysUserServiceImpl extends BaseServiceImpl&lt;SysUser, Integer&gt; implem
 					Legality = true;
 			}
 			if(Legality){
-				sysUserRepository.changePWD(id,new BCryptPasswordEncoder(4).encode("123456"));
+				String pwd = PwdGenerator.randomPassword(16);
+				sysUserRepository.changePWD(id,new BCryptPasswordEncoder(4).encode(pwd));
+				//发送邮件
+				EmailBean mail = new EmailBean();
+				mail.setSubject(IpUtils.getLocalIpAddress() +":密码重置");
+				mail.setContent(pwd);
+				mailUtils.sendMail(mail);
+				logger.info("setLD-sendMail:邮件发送成功！");
 				rs.put("status", ResponseCode.SUCCESS);
 				rs.put("msg", "密码重置成功！");
 			}else {
 				rs.put("status", ResponseCode.ERROR);
-				rs.put("msg", "您不是超级管理员无权限重置其他用户密码");
+				rs.put("msg", "您不是管理员无权限重置其他用户密码");
 			}
 		}catch (Exception e){
 			logger.error("", e);
@@ -180,4 +196,10 @@ public class SysUserServiceImpl extends BaseServiceImpl&lt;SysUser, Integer&gt; implem
 		}
 		return rs;
 	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void recordLoginDate(String userName) {
+		sysUserRepository.recordLoginDate(userName);
+	}
 }
+package com.bsth.util;
+
+import com.bsth.email.SimpleMailSender;
+import com.bsth.email.entity.EmailBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author Hill
+ */
+@Component
+public class MailUtils {
+
+    @Value("${admin.mail}")
+    private String emailSendToAddress;
+
+    private Tools tools = new Tools("mailbox.properties");
+
+    private SimpleMailSender sms = new SimpleMailSender(tools.getValue("username"),tools.getValue("password"));
+
+    public String getEmailSendToAddress() {
+        return emailSendToAddress;
+    }
+
+    public void setEmailSendToAddress(String emailSendToAddress) {
+        this.emailSendToAddress = emailSendToAddress;
+    }
+
+    /**
+     * recipients
+     * 收件人集合
+     * mail
+     * 邮件
+     */
+    public int sendMail(List<String> recipients, EmailBean mail){
+        try {
+            for (String recipient : recipients) {
+                sms.send(recipient, mail.getSubject(),mail.getContent());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return -1;
+        }
+        return 1;
+    }
+
+    /**
+     * recipient
+     * 收件人
+     * mail
+     * 邮件
+     */
+    public int sendMail(String recipient,EmailBean mail){
+        try {
+            sms.send(recipient, mail.getSubject(),mail.getContent());
+        } catch (Exception e) {
+            e.printStackTrace();
+            return -1;
+        }
+        return 1;
+    }
+
+    public int sendMail(EmailBean mail){
+        return sendMail(emailSendToAddress, mail);
+    }
+}
@@ -52,4 +52,6 @@ ms.fl.generate=true
 ## dsm ack interface
 dsm.ack.url= http://211.95.61.66:9008/modules/dsmCheckTheRecord/addDsm?
 ## cp ack interface
-cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
 \ No newline at end of file
+cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
+## admin mail
+admin.mail= 3090342880@qq.com
 \ No newline at end of file
@@ -54,4 +54,6 @@ ms.fl.generate=true
 ## dsm ack interface
 dsm.ack.url= http://211.95.61.66:9008/modules/dsmCheckTheRecord/addDsm?
 ## cp ack interface
-cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
 \ No newline at end of file
+cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
+## admin mail
+admin.mail= 3090342880@qq.com
 \ No newline at end of file
@@ -54,4 +54,6 @@ ms.fl.generate=false
 ## dsm ack interface
 dsm.ack.url= http://211.95.61.66:9008/modules/dsmCheckTheRecord/addDsm?
 ## cp ack interface
-cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
 \ No newline at end of file
+cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
+## admin mail
+admin.mail= 3090342880@qq.com
 \ No newline at end of file
-.maplibTc {
-	font-size: 12px;
-	width: 253px;
-	padding: 8px 5px 8px 8px;
-	background: #3B3F51;
-	position: absolute;
-	color: white;
-	box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0
-		rgba(0, 0, 0, 0.19);
-	top: 63px;
-}
-
-.maplibTc a {
-	text-decoration: none;
-}
-
-.maplibTcColor {
-	background: url("../img/tools_menu.png") no-repeat scroll 128px -86px
-		transparent;
-	font-weight: bold;
-	margin-bottom: 9px;
-	height: 18px;
-}
-
-.maplibTcUpdate {
-	float: left;
-	width: 13px;
-	height: 14px;
-	background: url(../img/tools_menu.png) no-repeat -12px -19px;
-	margin-left: 5px;
-	cursor: pointer;
-	margin-top: 2px;
-}
-
-.maplibTcView {
-	float: right;
-	color: #26c281;
-	text-decoration: none;
-	line-height: 15px;
-	*line-height: 18px
-}
-
-a.maplibTcView:hover {
-	color: #C6DDD3;
-}
-
-a.maplibTcView:focus {
-	color: #26c281;
-}
-
-.maplibTcCurTime {
-	float: left;
-	color: #ddd;
-}
-
-.maplibTcTime {
-	height: 20px;
-	padding: 5px 3px 0 0;
-}
-
-.maplibTcWeekDay {
-	height: 22px;
-	color: #6688CA;
-	padding: 3px 0;
-}
-
-.maplibTcWeekDay a {
-	color: #6688CA;
-	padding: 3px 2px;
-}
-
-.maplibTcWeekDay ul {
-	float: left;
-	margin: 0;
-	padding: 0;
-}
-
-.maplibTcWeekDay span {
-	float: left;
-	line-height: 23px;
-}
-
-.maplibTcWeekDay li {
-	float: left;
-	padding: 0 6px;
-	list-style: none;
-	line-height: 23px;
-}
-
-.maplibTcRule {
-	background: url("../img/bar.png") no-repeat scroll 0 10px transparent;
-	width: 195px;
-	float: left;
-	margin-left: 20px;
-	*margin-left: 10px;
-}
-
-.maplibTcRuleTxt {
-	float: left;
-	line-height: 44px;
-}
-
-.maplibTcClear {
-	clear: both;
-}
-
-.maplibTcTimeBox {
-	color: #6688CA;
-	margin-left: 137.5px;
-	font-size: 11px;
-	overflow: hidden;
-}
-
-.maplibTcTimeline {
-	height: 34px;
-}
-
-.maplibTcTimelinePrev {
-	overflow: hidden;
-	width: 9px;
-	height: 9px;
-	cursor: pointer;
-	float: left;
-	margin-top: 3px
-}
-
-.maplibTcTimelineNext {
-	overflow: hidden;
-	width: 11px;
-	*width: 10px;
-	height: 9px;
-	cursor: pointer;
-	float: right;
-	margin-top: 3px
-}
-
-.maplibTcTimeMove {
-	width: 9px;
-	height: 18px;
-	background: url("../img/tools_menu.png") no-repeat scroll 0pt -32px
-		transparent;
-	float: left;
-	cursor: pointer;
-	margin-left: 137.5px;
-	margin-top: 0px;
-}
-
-.maplibTcHide {
-	display: none;
-}
-
-.maplibTcBtn_deskTop {
-	background: url(http://api.map.baidu.com/images/bgs.gif) no-repeat
-		scroll 0px -271px transparent;
-	cursor: pointer;
-	height: 22px;
-	width: 73px;
-	z-index: 10;
-	position: absolute;
-}
-
-.maplibTcBtn_mobile {
-	background: url(http://api.map.baidu.com/images/traffic_bgs.png)
-		rgba(255, 255, 255, 0.8) no-repeat scroll -30px 0px;
-	border: 1px solid #AFAFAF;
-	background-size: 60px 30px;
-	cursor: pointer;
-	height: 30px;
-	width: 30px;
-	z-index: 10;
-	position: absolute;
-}
-
-.maplibTcBtn_deskTop {
-	background-position: 0px -249px
-}
-
-.maplibTcBtnOff_mobile {
-	background-position: 0px 0px;
-}
-
-.maplibTcColon {
-	float: left;
-}
-
-.maplibTcOn {
-	background: #E6EFF8;
-}
-
-.maplibTcClose {
-	background: url("../img/tools_menu.png") no-repeat scroll 2px -19px
-		transparent;
-	border: 0 none;
-	cursor: pointer;
-	height: 12px;
-	position: absolute;
-	right: 7px;
-	top: 9px;
-	width: 15px;
-}
-
-/*s--------------交通流量-----------------*/
-.maplibTfctr {
-	min-width: 9em;
-	height: 2.2em;
-	display: -webkit-box;
-	-webkit-box-align: center;
-	-webkit-border-radius: 0.3em;
-	border: .1em solid #989898;
-	-webkit-box-sizing: border-box;
-	background-color: #fff;
-	font-size: 14px;
-}
-
-.maplibTfctrHide {
-	display: none;
-}
-
-.maplibTfctr_c {
-	-webkit-box-flex: 1;
-}
-
-.maplibTfctr_status {
-	width: 4em;
-	margin-right: .45em;
-}
-
-.maplibTfctr_status span {
-	display: inline-block;
-	margin-left: .3em;
-	font-size: 14px;
-}
-
-.maplibTfctr div,.maplibTfctr span {
-	-webkit-box-sizing: border-box;
-}
-
-.maplibTfctr_l {
-	margin: 0 .15em;
-}
-
-.maplibY {
-	background: #ffae00;
-}
-
-.maplibR {
-	background: #ff0000;
-}
-
-.maplibG {
-	background: #1fba00;
-}
+.maplibTc {
+	font-size: 12px;
+	width: 253px;
+	padding: 8px 5px 8px 8px;
+	background: #3B3F51;
+	position: absolute;
+	color: white;
+	box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0
+		rgba(0, 0, 0, 0.19);
+	top: 63px;
+}
+
+.maplibTc a {
+	text-decoration: none;
+}
+
+.maplibTcColor {
+	background: url("../img/tools_menu.png") no-repeat scroll 128px -86px
+		transparent;
+	font-weight: bold;
+	margin-bottom: 9px;
+	height: 18px;
+}
+
+.maplibTcUpdate {
+	float: left;
+	width: 13px;
+	height: 14px;
+	background: url(../img/tools_menu.png) no-repeat -12px -19px;
+	margin-left: 5px;
+	cursor: pointer;
+	margin-top: 2px;
+}
+
+.maplibTcView {
+	float: right;
+	color: #26c281;
+	text-decoration: none;
+	line-height: 15px;
+	*line-height: 18px
+}
+
+a.maplibTcView:hover {
+	color: #C6DDD3;
+}
+
+a.maplibTcView:focus {
+	color: #26c281;
+}
+
+.maplibTcCurTime {
+	float: left;
+	color: #ddd;
+}
+
+.maplibTcTime {
+	height: 20px;
+	padding: 5px 3px 0 0;
+}
+
+.maplibTcWeekDay {
+	height: 22px;
+	color: #6688CA;
+	padding: 3px 0;
+}
+
+.maplibTcWeekDay a {
+	color: #6688CA;
+	padding: 3px 2px;
+}
+
+.maplibTcWeekDay ul {
+	float: left;
+	margin: 0;
+	padding: 0;
+}
+
+.maplibTcWeekDay span {
+	float: left;
+	line-height: 23px;
+}
+
+.maplibTcWeekDay li {
+	float: left;
+	padding: 0 6px;
+	list-style: none;
+	line-height: 23px;
+}
+
+.maplibTcRule {
+	background: url("../img/bar.png") no-repeat scroll 0 10px transparent;
+	width: 195px;
+	float: left;
+	margin-left: 20px;
+	*margin-left: 10px;
+}
+
+.maplibTcRuleTxt {
+	float: left;
+	line-height: 44px;
+}
+
+.maplibTcClear {
+	clear: both;
+}
+
+.maplibTcTimeBox {
+	color: #6688CA;
+	margin-left: 137.5px;
+	font-size: 11px;
+	overflow: hidden;
+}
+
+.maplibTcTimeline {
+	height: 34px;
+}
+
+.maplibTcTimelinePrev {
+	overflow: hidden;
+	width: 9px;
+	height: 9px;
+	cursor: pointer;
+	float: left;
+	margin-top: 3px
+}
+
+.maplibTcTimelineNext {
+	overflow: hidden;
+	width: 11px;
+	*width: 10px;
+	height: 9px;
+	cursor: pointer;
+	float: right;
+	margin-top: 3px
+}
+
+.maplibTcTimeMove {
+	width: 9px;
+	height: 18px;
+	background: url("../img/tools_menu.png") no-repeat scroll 0pt -32px
+		transparent;
+	float: left;
+	cursor: pointer;
+	margin-left: 137.5px;
+	margin-top: 0px;
+}
+
+.maplibTcHide {
+	display: none;
+}
+
+.maplibTcBtn_deskTop {
+	background: url(//api.map.baidu.com/images/bgs.gif) no-repeat
+		scroll 0px -271px transparent;
+	cursor: pointer;
+	height: 22px;
+	width: 73px;
+	z-index: 10;
+	position: absolute;
+}
+
+.maplibTcBtn_mobile {
+	background: url(//api.map.baidu.com/images/traffic_bgs.png)
+		rgba(255, 255, 255, 0.8) no-repeat scroll -30px 0px;
+	border: 1px solid #AFAFAF;
+	background-size: 60px 30px;
+	cursor: pointer;
+	height: 30px;
+	width: 30px;
+	z-index: 10;
+	position: absolute;
+}
+
+.maplibTcBtn_deskTop {
+	background-position: 0px -249px
+}
+
+.maplibTcBtnOff_mobile {
+	background-position: 0px 0px;
+}
+
+.maplibTcColon {
+	float: left;
+}
+
+.maplibTcOn {
+	background: #E6EFF8;
+}
+
+.maplibTcClose {
+	background: url("../img/tools_menu.png") no-repeat scroll 2px -19px
+		transparent;
+	border: 0 none;
+	cursor: pointer;
+	height: 12px;
+	position: absolute;
+	right: 7px;
+	top: 9px;
+	width: 15px;
+}
+
+/*s--------------交通流量-----------------*/
+.maplibTfctr {
+	min-width: 9em;
+	height: 2.2em;
+	display: -webkit-box;
+	-webkit-box-align: center;
+	-webkit-border-radius: 0.3em;
+	border: .1em solid #989898;
+	-webkit-box-sizing: border-box;
+	background-color: #fff;
+	font-size: 14px;
+}
+
+.maplibTfctrHide {
+	display: none;
+}
+
+.maplibTfctr_c {
+	-webkit-box-flex: 1;
+}
+
+.maplibTfctr_status {
+	width: 4em;
+	margin-right: .45em;
+}
+
+.maplibTfctr_status span {
+	display: inline-block;
+	margin-left: .3em;
+	font-size: 14px;
+}
+
+.maplibTfctr div,.maplibTfctr span {
+	-webkit-box-sizing: border-box;
+}
+
+.maplibTfctr_l {
+	margin: 0 .15em;
+}
+
+.maplibY {
+	background: #ffae00;
+}
+
+.maplibR {
+	background: #ff0000;
+}
+
+.maplibG {
+	background: #1fba00;
+}
 /*e--------------交通流量-----------------*/
 \ No newline at end of file
-/**
- * @fileoverview 此类表示地图上的一个覆盖物，该覆盖物由文字和图标组成，从Overlay继承。
- * 主入口类是<a href="symbols/BMapLib.TextIconOverlay.html">TextIconOverlay</a>，
- * 基于Baidu Map API 1.2。
- *
- * @author Baidu Map Api Group 
- * @version 1.2
- */
- 
-
- /** 
- * @namespace BMap的所有library类均放在BMapLib命名空间下
- */
-var BMapLib = window.BMapLib = BMapLib || {};
-
-(function () { 
-   
-    /**
-     * 声明baidu包
-     */
-    var T,
-    baidu = T = baidu || {version: "1.3.8"}; 
-    
-    (function (){
-        //提出guid，防止在与老版本Tangram混用时
-        //在下一行错误的修改window[undefined]
-        baidu.guid = "$BAIDU$";
-
-        //Tangram可能被放在闭包中
-        //一些页面级别唯一的属性，需要挂载在window[baidu.guid]上
-        window[baidu.guid] = window[baidu.guid] || {};
-
-        /**         
-        * @ignore
-        * @namespace baidu.dom 操作dom的方法。
-        */
-        baidu.dom = baidu.dom || {};
-    
-        
-        /**
-         * 从文档中获取指定的DOM元素
-         * @name baidu.dom.g
-         * @function
-         * @grammar baidu.dom.g(id)
-         * @param {string|HTMLElement} id 元素的id或DOM元素
-         * @shortcut g,T.G
-         * @meta standard
-         * @see baidu.dom.q
-         *             
-         * @returns {HTMLElement|null} 获取的元素，查找不到时返回null,如果参数不合法，直接返回参数
-         */
-        baidu.dom.g = function (id) {
-            if ('string' == typeof id || id instanceof String) {
-                return document.getElementById(id);
-            } else if (id && id.nodeName && (id.nodeType == 1 || id.nodeType == 9)) {
-                return id;
-            }
-            return null;
-        };
-
-        // 声明快捷方法
-        baidu.g = baidu.G = baidu.dom.g;
-
-        /**
-         * 获取目标元素所属的document对象
-         * @name baidu.dom.getDocument
-         * @function
-         * @grammar baidu.dom.getDocument(element)
-         * @param {HTMLElement|string} element 目标元素或目标元素的id
-         * @meta standard
-         * @see baidu.dom.getWindow
-         *             
-         * @returns {HTMLDocument} 目标元素所属的document对象
-         */
-        baidu.dom.getDocument = function (element) {
-            element = baidu.dom.g(element);
-            return element.nodeType == 9 ? element : element.ownerDocument || element.document;
-        };
-
-        /**
-           * @ignore
-         * @namespace baidu.lang 对语言层面的封装，包括类型判断、模块扩展、继承基类以及对象自定义事件的支持。
-        */
-        baidu.lang = baidu.lang || {};
-
-        /**
-         * 判断目标参数是否string类型或String对象
-         * @name baidu.lang.isString
-         * @function
-         * @grammar baidu.lang.isString(source)
-         * @param {Any} source 目标参数
-         * @shortcut isString
-         * @meta standard
-         * @see baidu.lang.isObject,baidu.lang.isNumber,baidu.lang.isArray,baidu.lang.isElement,baidu.lang.isBoolean,baidu.lang.isDate
-         *             
-         * @returns {boolean} 类型判断结果
-         */
-        baidu.lang.isString = function (source) {
-            return '[object String]' == Object.prototype.toString.call(source);
-        };
-
-        // 声明快捷方法
-        baidu.isString = baidu.lang.isString;
-
-        /**
-         * 从文档中获取指定的DOM元素
-         * **内部方法**
-         * 
-         * @param {string|HTMLElement} id 元素的id或DOM元素
-         * @meta standard
-         * @return {HTMLElement} DOM元素，如果不存在，返回null，如果参数不合法，直接返回参数
-         */
-        baidu.dom._g = function (id) {
-            if (baidu.lang.isString(id)) {
-                return document.getElementById(id);
-            }
-            return id;
-        };
-
-        // 声明快捷方法
-        baidu._g = baidu.dom._g;
-
-        /**
-         * @ignore
-         * @namespace baidu.browser 判断浏览器类型和特性的属性。
-         */
-        baidu.browser = baidu.browser || {};
-
-        if (/msie (\d+\.\d)/i.test(navigator.userAgent)) {
-            //IE 8下，以documentMode为准
-            //在百度模板中，可能会有$，防止冲突，将$1 写成 \x241
-            /**
-             * 判断是否为ie浏览器
-             * @property ie ie版本号
-             * @grammar baidu.browser.ie
-             * @meta standard
-             * @shortcut ie
-             * @see baidu.browser.firefox,baidu.browser.safari,baidu.browser.opera,baidu.browser.chrome,baidu.browser.maxthon 
-             */
-           baidu.browser.ie = baidu.ie = document.documentMode || + RegExp['\x241'];
-        }
-
-        /**
-         * 获取目标元素的computed style值。如果元素的样式值不能被浏览器计算，则会返回空字符串（IE）
-         *
-         * @author berg
-         * @name baidu.dom.getComputedStyle
-         * @function
-         * @grammar baidu.dom.getComputedStyle(element, key)
-         * @param {HTMLElement|string} element 目标元素或目标元素的id
-         * @param {string} key 要获取的样式名
-         *
-         * @see baidu.dom.getStyle
-         *             
-         * @returns {string} 目标元素的computed style值
-         */
-
-        baidu.dom.getComputedStyle = function(element, key){
-            element = baidu.dom._g(element);
-            var doc = baidu.dom.getDocument(element),
-                styles;
-            if (doc.defaultView && doc.defaultView.getComputedStyle) {
-                styles = doc.defaultView.getComputedStyle(element, null);
-                if (styles) {
-                    return styles[key] || styles.getPropertyValue(key);
-                }
-            }
-            return ''; 
-        };
-
-        /**
-         * 提供给setStyle与getStyle使用
-         */
-        baidu.dom._styleFixer = baidu.dom._styleFixer || {};
-
-        /**
-         * 提供给setStyle与getStyle使用
-         */
-        baidu.dom._styleFilter = baidu.dom._styleFilter || [];
-
-        /**
-         * 为获取和设置样式的过滤器
-         * @private
-         * @meta standard
-         */
-        baidu.dom._styleFilter.filter = function (key, value, method) {
-            for (var i = 0, filters = baidu.dom._styleFilter, filter; filter = filters[i]; i++) {
-                if (filter = filter[method]) {
-                    value = filter(key, value);
-                }
-            }
-            return value;
-        };
-
-        /**
-           * @ignore
-         * @namespace baidu.string 操作字符串的方法。
-         */
-        baidu.string = baidu.string || {};
-
-        /**
-         * 将目标字符串进行驼峰化处理
-         * @name baidu.string.toCamelCase
-         * @function
-         * @grammar baidu.string.toCamelCase(source)
-         * @param {string} source 目标字符串
-         * @remark
-         * 支持单词以“-_”分隔
-         * @meta standard
-         *             
-         * @returns {string} 驼峰化处理后的字符串
-         */
-        baidu.string.toCamelCase = function (source) {
-            //提前判断，提高getStyle等的效率 thanks xianwei
-            if (source.indexOf('-') < 0 && source.indexOf('_') < 0) {
-                return source;
-            }
-            return source.replace(/[-_][^-_]/g, function (match) {
-                return match.charAt(1).toUpperCase();
-            });
-        };
-
-        /**
-         * 获取目标元素的样式值
-         * @name baidu.dom.getStyle
-         * @function
-         * @grammar baidu.dom.getStyle(element, key)
-         * @param {HTMLElement|string} element 目标元素或目标元素的id
-         * @param {string} key 要获取的样式名
-         * @remark
-         * 
-         * 为了精简代码，本模块默认不对任何浏览器返回值进行归一化处理（如使用getStyle时，不同浏览器下可能返回rgb颜色或hex颜色），也不会修复浏览器的bug和差异性（如设置IE的float属性叫styleFloat，firefox则是cssFloat）。<br />
-         * baidu.dom._styleFixer和baidu.dom._styleFilter可以为本模块提供支持。<br />
-         * 其中_styleFilter能对颜色和px进行归一化处理，_styleFixer能对display，float，opacity，textOverflow的浏览器兼容性bug进行处理。	
-         * @shortcut getStyle
-         * @meta standard
-         * @see baidu.dom.setStyle,baidu.dom.setStyles, baidu.dom.getComputedStyle
-         *             
-         * @returns {string} 目标元素的样式值
-         */
-        baidu.dom.getStyle = function (element, key) {
-            var dom = baidu.dom;
-
-            element = dom.g(element);
-            key = baidu.string.toCamelCase(key);
-            //computed style, then cascaded style, then explicitly set style.
-            var value = element.style[key] ||
-                        (element.currentStyle ? element.currentStyle[key] : "") || 
-                        dom.getComputedStyle(element, key);
-
-            // 在取不到值的时候，用fixer进行修正
-            if (!value) {
-                var fixer = dom._styleFixer[key];
-                if(fixer){
-                    value = fixer.get ? fixer.get(element) : baidu.dom.getStyle(element, fixer);
-                }
-            }
-    
-            /* 检查结果过滤器 */
-            if (fixer = dom._styleFilter) {
-                value = fixer.filter(key, value, 'get');
-            }
-
-            return value;
-        };
-
-        // 声明快捷方法
-        baidu.getStyle = baidu.dom.getStyle;
-
-
-        if (/opera\/(\d+\.\d)/i.test(navigator.userAgent)) {
-        /**
-         * 判断是否为opera浏览器
-         * @property opera opera版本号
-         * @grammar baidu.browser.opera
-         * @meta standard
-         * @see baidu.browser.ie,baidu.browser.firefox,baidu.browser.safari,baidu.browser.chrome 
-         */
-            baidu.browser.opera = + RegExp['\x241'];
-        }
-
-        /**
-         * 判断是否为webkit内核
-         * @property isWebkit 
-         * @grammar baidu.browser.isWebkit
-         * @meta standard
-         * @see baidu.browser.isGecko
-         */
-        baidu.browser.isWebkit = /webkit/i.test(navigator.userAgent);
-
-        /**
-         * 判断是否为gecko内核
-         * @property isGecko 
-         * @grammar baidu.browser.isGecko
-         * @meta standard
-         * @see baidu.browser.isWebkit
-         */
-        baidu.browser.isGecko = /gecko/i.test(navigator.userAgent) && !/like gecko/i.test(navigator.userAgent);
-
-        /**
-         * 判断是否严格标准的渲染模式
-         * @property isStrict 
-         * @grammar baidu.browser.isStrict
-         * @meta standard
-         */
-        baidu.browser.isStrict = document.compatMode == "CSS1Compat";
-
-        /**
-         * 获取目标元素相对于整个文档左上角的位置
-         * @name baidu.dom.getPosition
-         * @function
-         * @grammar baidu.dom.getPosition(element)
-         * @param {HTMLElement|string} element 目标元素或目标元素的id
-         * @meta standard
-         *             
-         * @returns {Object} 目标元素的位置，键值为top和left的Object。
-         */
-        baidu.dom.getPosition = function (element) {
-            element = baidu.dom.g(element);
-            var doc = baidu.dom.getDocument(element), 
-                browser = baidu.browser,
-                getStyle = baidu.dom.getStyle,
-            // Gecko 1.9版本以下用getBoxObjectFor计算位置
-            // 但是某些情况下是有bug的
-            // 对于这些有bug的情况
-            // 使用递归查找的方式
-                BUGGY_GECKO_BOX_OBJECT = browser.isGecko > 0 && 
-                                         doc.getBoxObjectFor &&
-                                         getStyle(element, 'position') == 'absolute' &&
-                                         (element.style.top === '' || element.style.left === ''),
-                pos = {"left":0,"top":0},
-                viewport = (browser.ie && !browser.isStrict) ? doc.body : doc.documentElement,
-                parent,
-                box;
-    
-            if(element == viewport){
-                return pos;
-            }
-
-            if(element.getBoundingClientRect){ // IE and Gecko 1.9+
-        
-                //当HTML或者BODY有border width时, 原生的getBoundingClientRect返回值是不符合预期的
-                //考虑到通常情况下 HTML和BODY的border只会设成0px,所以忽略该问题.
-                box = element.getBoundingClientRect();
-
-                pos.left = Math.floor(box.left) + Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft);
-                pos.top  = Math.floor(box.top)  + Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop);
-        
-                // IE会给HTML元素添加一个border，默认是medium（2px）
-                // 但是在IE 6 7 的怪异模式下，可以被html { border: 0; } 这条css规则覆盖
-                // 在IE7的标准模式下，border永远是2px，这个值通过clientLeft 和 clientTop取得
-                // 但是。。。在IE 6 7的怪异模式，如果用户使用css覆盖了默认的medium
-                // clientTop和clientLeft不会更新
-                pos.left -= doc.documentElement.clientLeft;
-                pos.top  -= doc.documentElement.clientTop;
-        
-                var htmlDom = doc.body,
-                    // 在这里，不使用element.style.borderLeftWidth，只有computedStyle是可信的
-                    htmlBorderLeftWidth = parseInt(getStyle(htmlDom, 'borderLeftWidth')),
-                    htmlBorderTopWidth = parseInt(getStyle(htmlDom, 'borderTopWidth'));
-                if(browser.ie && !browser.isStrict){
-                    pos.left -= isNaN(htmlBorderLeftWidth) ? 2 : htmlBorderLeftWidth;
-                    pos.top  -= isNaN(htmlBorderTopWidth) ? 2 : htmlBorderTopWidth;
-                }
-            } else { 
-                // safari/opera/firefox
-                parent = element;
-
-                do {
-                    pos.left += parent.offsetLeft;
-                    pos.top  += parent.offsetTop;
-      
-                    // safari里面，如果遍历到了一个fixed的元素，后面的offset都不准了
-                    if (browser.isWebkit > 0 && getStyle(parent, 'position') == 'fixed') {
-                        pos.left += doc.body.scrollLeft;
-                        pos.top  += doc.body.scrollTop;
-                        break;
-                    }
-            
-                    parent = parent.offsetParent;
-                } while (parent && parent != element);
-
-                // 对body offsetTop的修正
-                if(browser.opera > 0 || (browser.isWebkit > 0 && getStyle(element, 'position') == 'absolute')){
-                    pos.top  -= doc.body.offsetTop;
-                }
-
-                // 计算除了body的scroll
-                parent = element.offsetParent;
-                while (parent && parent != doc.body) {
-                    pos.left -= parent.scrollLeft;
-                    // see https://bugs.opera.com/show_bug.cgi?id=249965
-                    if (!browser.opera || parent.tagName != 'TR') {
-                        pos.top -= parent.scrollTop;
-                    }
-                    parent = parent.offsetParent;
-                }
-            }
-
-            return pos;
-        };
-
-        /**
-         * @ignore
-         * @namespace baidu.event 屏蔽浏览器差异性的事件封装。
-         * @property target 	事件的触发元素
-         * @property pageX 		鼠标事件的鼠标x坐标
-         * @property pageY 		鼠标事件的鼠标y坐标
-         * @property keyCode 	键盘事件的键值
-         */
-        baidu.event = baidu.event || {};
-
-        /**
-         * 事件监听器的存储表
-         * @private
-         * @meta standard
-         */
-        baidu.event._listeners = baidu.event._listeners || [];
-
-        /**
-         * 为目标元素添加事件监听器
-         * @name baidu.event.on
-         * @function
-         * @grammar baidu.event.on(element, type, listener)
-         * @param {HTMLElement|string|window} element 目标元素或目标元素id
-         * @param {string} type 事件类型
-         * @param {Function} listener 需要添加的监听器
-         * @remark
-         * 
-        1. 不支持跨浏览器的鼠标滚轮事件监听器添加<br>
-        2. 改方法不为监听器灌入事件对象，以防止跨iframe事件挂载的事件对象获取失败
-    
-         * @shortcut on
-         * @meta standard
-         * @see baidu.event.un
-         *             
-         * @returns {HTMLElement|window} 目标元素
-         */
-        baidu.event.on = function (element, type, listener) {
-            type = type.replace(/^on/i, '');
-            element = baidu.dom._g(element);
-
-            var realListener = function (ev) {
-                    // 1. 这里不支持EventArgument,  原因是跨frame的事件挂载
-                    // 2. element是为了修正this
-                    listener.call(element, ev);
-                },
-                lis = baidu.event._listeners,
-                filter = baidu.event._eventFilter,
-                afterFilter,
-                realType = type;
-            type = type.toLowerCase();
-            // filter过滤
-            if(filter && filter[type]){
-                afterFilter = filter[type](element, type, realListener);
-                realType = afterFilter.type;
-                realListener = afterFilter.listener;
-            }
-    
-            // 事件监听器挂载
-            if (element.addEventListener) {
-                element.addEventListener(realType, realListener, false);
-            } else if (element.attachEvent) {
-                element.attachEvent('on' + realType, realListener);
-            }
-  
-            // 将监听器存储到数组中
-            lis[lis.length] = [element, type, listener, realListener, realType];
-            return element;
-        };
-
-        // 声明快捷方法
-        baidu.on = baidu.event.on;
-
-        /**
-         * 返回一个当前页面的唯一标识字符串。
-         * @name baidu.lang.guid
-         * @function
-         * @grammar baidu.lang.guid()
-         * @version 1.1.1
-         * @meta standard
-         *             
-         * @returns {String} 当前页面的唯一标识字符串
-         */
-
-        (function(){
-            //不直接使用window，可以提高3倍左右性能
-            var guid = window[baidu.guid];
-
-            baidu.lang.guid = function() {
-                return "TANGRAM__" + (guid._counter ++).toString(36);
-            };
-
-            guid._counter = guid._counter || 1;
-        })();
-
-        /**
-         * 所有类的实例的容器
-         * key为每个实例的guid
-         * @meta standard
-         */
-
-        window[baidu.guid]._instances = window[baidu.guid]._instances || {};
-
-        /**
-         * 判断目标参数是否为function或Function实例
-         * @name baidu.lang.isFunction
-         * @function
-         * @grammar baidu.lang.isFunction(source)
-         * @param {Any} source 目标参数
-         * @version 1.2
-         * @see baidu.lang.isString,baidu.lang.isObject,baidu.lang.isNumber,baidu.lang.isArray,baidu.lang.isElement,baidu.lang.isBoolean,baidu.lang.isDate
-         * @meta standard
-         * @returns {boolean} 类型判断结果
-         */
-        baidu.lang.isFunction = function (source) {
-            // chrome下,'function' == typeof /a/ 为true.
-            return '[object Function]' == Object.prototype.toString.call(source);
-        };
-
-        /**
-         *    
-         * @ignore
-         * @class  Tangram继承机制提供的一个基类，用户可以通过继承baidu.lang.Class来获取它的属性及方法。
-         * @name 	baidu.lang.Class
-         * @grammar baidu.lang.Class(guid)
-         * @param 	{string}	guid	对象的唯一标识
-         * @meta standard
-         * @remark baidu.lang.Class和它的子类的实例均包含一个全局唯一的标识guid。guid是在构造函数中生成的，因此，继承自baidu.lang.Class的类应该直接或者间接调用它的构造函数。<br>baidu.lang.Class的构造函数中产生guid的方式可以保证guid的唯一性，及每个实例都有一个全局唯一的guid。
-         * @meta standard
-         * @see baidu.lang.inherits,baidu.lang.Event
-         */
-        baidu.lang.Class = function(guid) {
-            this.guid = guid || baidu.lang.guid();
-            window[baidu.guid]._instances[this.guid] = this;
-        };
-        window[baidu.guid]._instances = window[baidu.guid]._instances || {};
-
-        /**
-         * 释放对象所持有的资源，主要是自定义事件。
-         * @name dispose
-         * @grammar obj.dispose()
-         */
-        baidu.lang.Class.prototype.dispose = function(){
-            delete window[baidu.guid]._instances[this.guid];
-
-            for(var property in this){
-                if (!baidu.lang.isFunction(this[property])) {
-                    delete this[property];
-                }
-            }
-            this.disposed = true;
-        };
-
-        /**
-         * 重载了默认的toString方法，使得返回信息更加准确一些。
-         * @return {string} 对象的String表示形式
-         */
-        baidu.lang.Class.prototype.toString = function(){
-            return "[object " + (this._className || "Object" ) + "]";
-        };
-
-        /**
-         * @ignore
-         * @class   自定义的事件对象。
-         * @name 	baidu.lang.Event
-         * @grammar baidu.lang.Event(type[, target])
-         * @param 	{string} type	 事件类型名称。为了方便区分事件和一个普通的方法，事件类型名称必须以"on"(小写)开头。
-         * @param 	{Object} [target]触发事件的对象
-         * @meta standard
-         * @remark 引入该模块，会自动为Class引入3个事件扩展方法：addEventListener、removeEventListener和dispatchEvent。
-         * @meta standard
-         * @see baidu.lang.Class
-         */
-        baidu.lang.Event = function (type, target) {
-            this.type = type;
-            this.returnValue = true;
-            this.target = target || null;
-            this.currentTarget = null;
-        };
-
-        /**
-         * 注册对象的事件监听器。引入baidu.lang.Event后，Class的子类实例才会获得该方法。
-         * @grammar obj.addEventListener(type, handlers[, key])
-         * @param 	{string}   type         自定义事件的名称
-         * @param 	{Function} handler      自定义事件被触发时应该调用的回调函数
-         * @param 	{string}   [key]		为事件监听函数指定的名称，可在移除时使用。如果不提供，方法会默认为它生成一个全局唯一的key。
-         * @remark 	事件类型区分大小写。如果自定义事件名称不是以小写"on"开头，该方法会给它加上"on"再进行判断，即"click"和"onclick"会被认为是同一种事件。 
-         */
-        baidu.lang.Class.prototype.addEventListener = function (type, handler, key) {
-            if (!baidu.lang.isFunction(handler)) {
-                return;
-            }
-
-            !this.__listeners && (this.__listeners = {});
-
-            var t = this.__listeners, id;
-            if (typeof key == "string" && key) {
-                if (/[^\w\-]/.test(key)) {
-                    throw("nonstandard key:" + key);
-                } else {
-                    handler.hashCode = key; 
-                    id = key;
-                }
-            }
-            type.indexOf("on") != 0 && (type = "on" + type);
-
-            typeof t[type] != "object" && (t[type] = {});
-            id = id || baidu.lang.guid();
-            handler.hashCode = id;
-            t[type][id] = handler;
-        };
- 
-        /**
-         * 移除对象的事件监听器。引入baidu.lang.Event后，Class的子类实例才会获得该方法。
-         * @grammar obj.removeEventListener(type, handlers)
-         * @param {string}   type     事件类型
-         * @param {Function|string} handler  要移除的事件监听函数或者监听函数的key
-         * @remark 	如果第二个参数handler没有被绑定到对应的自定义事件中，什么也不做。
-         */
-        baidu.lang.Class.prototype.removeEventListener = function (type, handler) {
-            if (typeof handler != "undefined") {
-                if ( (baidu.lang.isFunction(handler) && ! (handler = handler.hashCode))
-                    || (! baidu.lang.isString(handler))
-                ){
-                    return;
-                }
-            }
-
-            !this.__listeners && (this.__listeners = {});
-
-            type.indexOf("on") != 0 && (type = "on" + type);
-
-            var t = this.__listeners;
-            if (!t[type]) {
-                return;
-            }
-            if (typeof handler != "undefined") {
-                t[type][handler] && delete t[type][handler];
-            } else {
-                for(var guid in t[type]){
-                    delete t[type][guid];
-                }
-            }
-        };
-
-        /**
-         * 派发自定义事件，使得绑定到自定义事件上面的函数都会被执行。引入baidu.lang.Event后，Class的子类实例才会获得该方法。
-         * @grammar obj.dispatchEvent(event, options)
-         * @param {baidu.lang.Event|String} event 	Event对象，或事件名称(1.1.1起支持)
-         * @param {Object} 					options 扩展参数,所含属性键值会扩展到Event对象上(1.2起支持)
-         * @remark 处理会调用通过addEventListenr绑定的自定义事件回调函数之外，还会调用直接绑定到对象上面的自定义事件。例如：<br>
-        myobj.onMyEvent = function(){}<br>
-        myobj.addEventListener("onMyEvent", function(){});
-         */
-        baidu.lang.Class.prototype.dispatchEvent = function (event, options) {
-            if (baidu.lang.isString(event)) {
-                event = new baidu.lang.Event(event);
-            }
-            !this.__listeners && (this.__listeners = {});
-
-            // 20100603 添加本方法的第二个参数，将 options extend到event中去传递
-            options = options || {};
-            for (var i in options) {
-                event[i] = options[i];
-            }
-
-            var i, t = this.__listeners, p = event.type;
-            event.target = event.target || this;
-            event.currentTarget = this;
-
-            p.indexOf("on") != 0 && (p = "on" + p);
-
-            baidu.lang.isFunction(this[p]) && this[p].apply(this, arguments);
-
-            if (typeof t[p] == "object") {
-                for (i in t[p]) {
-                    t[p][i].apply(this, arguments);
-                }
-            }
-            return event.returnValue;
-        };
-
-
-        baidu.lang.inherits = function (subClass, superClass, className) {
-            var key, proto,
-                selfProps = subClass.prototype,
-                clazz = new Function();
-
-            clazz.prototype = superClass.prototype;
-            proto = subClass.prototype = new clazz();
-            for (key in selfProps) {
-                proto[key] = selfProps[key];
-            }
-            subClass.prototype.constructor = subClass;
-            subClass.superClass = superClass.prototype;
-
-            // 类名标识，兼容Class的toString，基本没用
-            if ("string" == typeof className) {
-                proto._className = className;
-            }
-        };
-        // 声明快捷方法
-        baidu.inherits = baidu.lang.inherits;
-    })();
-
-
-    /**
-    
-     * 图片的路径
-
-     * @private
-     * @type {String}
-    
-     */
-    var _IMAGE_PATH = 'http://api.map.baidu.com/library/TextIconOverlay/1.2/src/images/m';
-
-    /**
-    
-     * 图片的后缀名
-
-      * @private
-     * @type {String}
-    
-     */
-    var _IMAGE_EXTENSION  = 'png';
-
-    /**
-     *@exports TextIconOverlay as BMapLib.TextIconOverlay
-     */
-    var TextIconOverlay = 
-        /**
-        * TextIconOverlay
-        * @class 此类表示地图上的一个覆盖物，该覆盖物由文字和图标组成，从Overlay继承。文字通常是数字（0-9）或字母（A-Z ），而文字与图标之间有一定的映射关系。
-        *该覆盖物适用于以下类似的场景：需要在地图上添加一系列覆盖物，这些覆盖物之间用不同的图标和文字来区分，文字可能表示了该覆盖物的某一属性值，根据该文字和一定的映射关系，自动匹配相应颜色和大小的图标。
-        *
-        *@constructor
-        *@param {Point} position 表示一个经纬度坐标位置。
-        *@param {String} text 表示该覆盖物显示的文字信息。
-        *@param {Json Object} options 可选参数，可选项包括：<br />
-        *"<b>styles</b>":{Array<IconStyle>} 一组图标风格。单个图表风格包括以下几个属性：<br />
-        *   url	{String}	 图片的url地址。(必选)<br />
-        *   size {Size}	图片的大小。（必选）<br />
-        *   anchor {Size} 图标定位在地图上的位置相对于图标左上角的偏移值，默认偏移值为图标的中心位置。（可选）<br />
-        *   offset {Size} 图片相对于可视区域的偏移值，此功能的作用等同于CSS中的background-position属性。（可选）<br />
-        *   textSize {Number} 文字的大小。（可选，默认10）<br />
-        *   textColor {String} 文字的颜色。（可选，默认black）<br />
-        */
-        BMapLib.TextIconOverlay = function(position, text, options){
-            this._position = position;
-            this._text = text;
-            this._options = options || {};
-            this._styles = this._options['styles'] || [];
-            (!this._styles.length) && this._setupDefaultStyles();                  
-        };
-
-    T.lang.inherits(TextIconOverlay, BMap.Overlay, "TextIconOverlay");
-
-    TextIconOverlay.prototype._setupDefaultStyles = function(){  
-        var sizes = [53, 56, 66, 78, 90];
-        for(var i = 0, size; size = sizes[i]; i++){
-            this._styles.push({
-                url:_IMAGE_PATH + i + '.' + _IMAGE_EXTENSION,
-                size: new BMap.Size(size, size)
-            });
-        }//for循环的简洁写法
-    };
-
-    /**
-    *继承Overlay的intialize方法，自定义覆盖物时必须。
-    *@param {Map} map BMap.Map的实例化对象。
-    *@return {HTMLElement} 返回覆盖物对应的HTML元素。
-    */
-    TextIconOverlay.prototype.initialize = function(map){
-        this._map = map;
-    
-        this._domElement = document.createElement('div');     
-        this._updateCss();    
-        this._updateText();
-        this._updatePosition(); 
-        
-        this._bind();
-
-        this._map.getPanes().markerMouseTarget.appendChild(this._domElement);
-        return this._domElement;   
-    };
-
-    /**
-    *继承Overlay的draw方法，自定义覆盖物时必须。
-    *@return 无返回值。
-    */
-    TextIconOverlay.prototype.draw = function(){
-        this._map && this._updatePosition();
-    };
-    
-    /**
-    *获取该覆盖物上的文字。
-    *@return {String} 该覆盖物上的文字。
-    */
-    TextIconOverlay.prototype.getText = function(){
-        return this._text;
-    };
-
-    /**
-    *设置该覆盖物上的文字。
-    *@param {String} text 要设置的文字，通常是字母A-Z或数字0-9。
-    *@return 无返回值。
-    */
-    TextIconOverlay.prototype.setText = function(text){
-        if(text && (!this._text || (this._text.toString() != text.toString()))){
-            this._text = text;
-            this._updateText();
-            this._updateCss();
-            this._updatePosition(); 
-        }
-    };
-
-    /**
-    *获取该覆盖物的位置。
-    *@return {Point} 该覆盖物的经纬度坐标。
-    */
-    TextIconOverlay.prototype.getPosition = function () {
-        return this._position;
-    };
-   
-    /**
-    *设置该覆盖物的位置。
-    *@param {Point}  position 要设置的经纬度坐标。
-    *@return 无返回值。
-    */
-    TextIconOverlay.prototype.setPosition = function (position) {
-        if(position && (!this._position || !this._position.equals(position))){
-            this._position = position;  
-            this._updatePosition();
-        }
-    };
-
-    /**
-    *由文字信息获取风格数组的对应索引值。
-    *内部默认的对应函数为文字转换为数字除以10的结果，比如文字8返回索引0，文字25返回索引2.
-    *如果需要自定义映射关系，请覆盖该函数。
-    *@param {String} text  文字。
-    *@param {Array<IconStyle>}  styles 一组图标风格。
-    *@return {Number} 对应的索引值。
-    */
-    TextIconOverlay.prototype.getStyleByText = function(text, styles){
-        var count = parseInt(text);
-        var index = parseInt(count / 10);
-        index = Math.max(0, index);
-        index = Math.min(index, styles.length - 1);
-        return styles[index]; 
-    }
-
-    /**
-    *更新相应的CSS。
-    *@return 无返回值。
-    */
-    TextIconOverlay.prototype._updateCss = function(){
-        var style = this.getStyleByText(this._text, this._styles);
-        this._domElement.style.cssText = this._buildCssText(style);
-    };
-
-    /**
-    *更新覆盖物的显示文字。
-    *@return 无返回值。
-    */
-    TextIconOverlay.prototype._updateText = function(){
-        if (this._domElement) {
-            this._domElement.innerHTML = this._text;
-        }
-    };
-
-    /**
-    *调整覆盖物在地图上的位置更新覆盖物的显示文字。
-    *@return 无返回值。
-    */
-    TextIconOverlay.prototype._updatePosition = function(){
-        if (this._domElement && this._position) {
-            var style = this._domElement.style;
-            var pixelPosition= this._map.pointToOverlayPixel(this._position); 
-            pixelPosition.x -= Math.ceil(parseInt(style.width) / 2);
-            pixelPosition.y -= Math.ceil(parseInt(style.height) / 2);       
-            style.left = pixelPosition.x + "px";
-            style.top = pixelPosition.y + "px";
-        }
-    };
-    
-    /**
-    * 为该覆盖物的HTML元素构建CSS
-    * @param {IconStyle}  一个图标的风格。
-    * @return {String} 构建完成的CSSTEXT。
-    */
-    TextIconOverlay.prototype._buildCssText = function(style) {    
-        //根据style来确定一些默认值
-        var url = style['url'];
-        var size = style['size'];
-        var anchor = style['anchor'];
-        var offset = style['offset'];
-        var textColor = style['textColor'] || 'black';
-        var textSize = style['textSize'] || 10;
-
-        var csstext = [];
-        if (T.browser["ie"] < 7) {
-            csstext.push('filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(' +
-                'sizingMethod=scale,src="' + url + '");');
-        } else {
-            csstext.push('background-image:url(' + url + ');');
-            var backgroundPosition = '0 0';
-            (offset instanceof BMap.Size) && (backgroundPosition = offset.width + 'px' + ' ' + offset.height + 'px');          
-            csstext.push('background-position:' + backgroundPosition + ';');
-        }
-
-        if (size instanceof BMap.Size){
-            if (anchor instanceof BMap.Size) {
-                if (anchor.height > 0 && anchor.height < size.height) {
-                      csstext.push('height:' + (size.height - anchor.height) + 'px; padding-top:' + anchor.height + 'px;');
-                }
-                if(anchor.width > 0 && anchor.width < size.width){
-                    csstext.push('width:' + (size.width - anchor.width) + 'px; padding-left:' + anchor.width + 'px;');                
-                }
-            } else {
-                csstext.push('height:' + size.height + 'px; line-height:' + size.height + 'px;');
-                csstext.push('width:' + size.width + 'px; text-align:center;');
-            }
-        }
-   
-        csstext.push('cursor:pointer; color:' + textColor + '; position:absolute; font-size:' +
-            textSize + 'px; font-family:Arial,sans-serif; font-weight:bold');
-        return csstext.join('');
-    };
-
-
-    /**
-    
-     * 当鼠标点击该覆盖物时会触发该事件
-
-     * @name TextIconOverlay#click
-
-     * @event
-
-     * @param {Event Object} e 回调函数会返回event参数，包括以下返回值：
-    
-     * <br />"<b>type</b> : {String} 事件类型
-
-     * <br />"<b>target</b>：{BMapLib.TextIconOverlay} 事件目标
-
-     *
-
-     */
-
-    /**
-
-     * 当鼠标进入该覆盖物区域时会触发该事件
-
-     * @name TextIconOverlay#mouseover
-
-     * @event
-     * @param {Event Object} e 回调函数会返回event参数，包括以下返回值：
-    
-     * <br />"<b>type</b> : {String} 事件类型
-
-     * <br />"<b>target</b>：{BMapLib.TextIconOverlay} 事件目标
-
-     * <br />"<b>point</b> : {BMap.Point} 最新添加上的节点BMap.Point对象
-
-     * <br />"<b>pixel</b>：{BMap.pixel} 最新添加上的节点BMap.Pixel对象
-
-     *
-
-     * @example <b>参考示例：</b><br />
-
-     * myTextIconOverlay.addEventListener("mouseover", function(e) {  alert(e.point);  });
-
-     */
-
-    /**
-
-     * 当鼠标离开该覆盖物区域时会触发该事件
-
-     * @name TextIconOverlay#mouseout
-
-     * @event
-
-     * @param {Event Object} e 回调函数会返回event参数，包括以下返回值：
-
-     * <br />"<b>type</b> : {String} 事件类型
-
-     * <br />"<b>target</b>：{BMapLib.TextIconOverlay} 事件目标
-
-     * <br />"<b>point</b> : {BMap.Point} 最新添加上的节点BMap.Point对象
-
-     * <br />"<b>pixel</b>：{BMap.pixel} 最新添加上的节点BMap.Pixel对象
-
-     *
-
-     * @example <b>参考示例：</b><br />
-
-     * myTextIconOverlay.addEventListener("mouseout", function(e) {  alert(e.point);  });
-
-     */
-
-
-    /**
-    * 为该覆盖物绑定一系列事件
-    * 当前支持click mouseover mouseout
-    * @return 无返回值。
-    */
-    TextIconOverlay.prototype._bind = function(){
-        if (!this._domElement){
-            return;
-        }
-
-        var me = this;
-        var map = this._map;
-
-        var BaseEvent = T.lang.Event;
-        function eventExtend(e, be){
-            var elem = e.srcElement || e.target;
-            var x = e.clientX || e.pageX;
-            var y = e.clientY || e.pageY;
-            if (e && be && x && y && elem){
-                var offset = T.dom.getPosition(map.getContainer());
-                be.pixel = new BMap.Pixel(x - offset.left, y - offset.top);
-                be.point = map.pixelToPoint(be.pixel);
-            }
-            return be;
-        }//给事件参数增加pixel和point两个值
-
-        T.event.on(this._domElement,"mouseover", function(e){
-            me.dispatchEvent(eventExtend(e, new BaseEvent("onmouseover")));
-        });
-        T.event.on(this._domElement,"mouseout", function(e){
-            me.dispatchEvent(eventExtend(e, new BaseEvent("onmouseout")));
-        });
-        T.event.on(this._domElement,"click", function(e){
-            me.dispatchEvent(eventExtend(e, new BaseEvent("onclick")));
-        });
-    };
-
+/**
+ * @fileoverview 此类表示地图上的一个覆盖物，该覆盖物由文字和图标组成，从Overlay继承。
+ * 主入口类是<a href="symbols/BMapLib.TextIconOverlay.html">TextIconOverlay</a>，
+ * 基于Baidu Map API 1.2。
+ *
+ * @author Baidu Map Api Group 
+ * @version 1.2
+ */
+ 
+
+ /** 
+ * @namespace BMap的所有library类均放在BMapLib命名空间下
+ */
+var BMapLib = window.BMapLib = BMapLib || {};
+
+(function () { 
+   
+    /**
+     * 声明baidu包
+     */
+    var T,
+    baidu = T = baidu || {version: "1.3.8"}; 
+    
+    (function (){
+        //提出guid，防止在与老版本Tangram混用时
+        //在下一行错误的修改window[undefined]
+        baidu.guid = "$BAIDU$";
+
+        //Tangram可能被放在闭包中
+        //一些页面级别唯一的属性，需要挂载在window[baidu.guid]上
+        window[baidu.guid] = window[baidu.guid] || {};
+
+        /**         
+        * @ignore
+        * @namespace baidu.dom 操作dom的方法。
+        */
+        baidu.dom = baidu.dom || {};
+    
+        
+        /**
+         * 从文档中获取指定的DOM元素
+         * @name baidu.dom.g
+         * @function
+         * @grammar baidu.dom.g(id)
+         * @param {string|HTMLElement} id 元素的id或DOM元素
+         * @shortcut g,T.G
+         * @meta standard
+         * @see baidu.dom.q
+         *             
+         * @returns {HTMLElement|null} 获取的元素，查找不到时返回null,如果参数不合法，直接返回参数
+         */
+        baidu.dom.g = function (id) {
+            if ('string' == typeof id || id instanceof String) {
+                return document.getElementById(id);
+            } else if (id && id.nodeName && (id.nodeType == 1 || id.nodeType == 9)) {
+                return id;
+            }
+            return null;
+        };
+
+        // 声明快捷方法
+        baidu.g = baidu.G = baidu.dom.g;
+
+        /**
+         * 获取目标元素所属的document对象
+         * @name baidu.dom.getDocument
+         * @function
+         * @grammar baidu.dom.getDocument(element)
+         * @param {HTMLElement|string} element 目标元素或目标元素的id
+         * @meta standard
+         * @see baidu.dom.getWindow
+         *             
+         * @returns {HTMLDocument} 目标元素所属的document对象
+         */
+        baidu.dom.getDocument = function (element) {
+            element = baidu.dom.g(element);
+            return element.nodeType == 9 ? element : element.ownerDocument || element.document;
+        };
+
+        /**
+           * @ignore
+         * @namespace baidu.lang 对语言层面的封装，包括类型判断、模块扩展、继承基类以及对象自定义事件的支持。
+        */
+        baidu.lang = baidu.lang || {};
+
+        /**
+         * 判断目标参数是否string类型或String对象
+         * @name baidu.lang.isString
+         * @function
+         * @grammar baidu.lang.isString(source)
+         * @param {Any} source 目标参数
+         * @shortcut isString
+         * @meta standard
+         * @see baidu.lang.isObject,baidu.lang.isNumber,baidu.lang.isArray,baidu.lang.isElement,baidu.lang.isBoolean,baidu.lang.isDate
+         *             
+         * @returns {boolean} 类型判断结果
+         */
+        baidu.lang.isString = function (source) {
+            return '[object String]' == Object.prototype.toString.call(source);
+        };
+
+        // 声明快捷方法
+        baidu.isString = baidu.lang.isString;
+
+        /**
+         * 从文档中获取指定的DOM元素
+         * **内部方法**
+         * 
+         * @param {string|HTMLElement} id 元素的id或DOM元素
+         * @meta standard
+         * @return {HTMLElement} DOM元素，如果不存在，返回null，如果参数不合法，直接返回参数
+         */
+        baidu.dom._g = function (id) {
+            if (baidu.lang.isString(id)) {
+                return document.getElementById(id);
+            }
+            return id;
+        };
+
+        // 声明快捷方法
+        baidu._g = baidu.dom._g;
+
+        /**
+         * @ignore
+         * @namespace baidu.browser 判断浏览器类型和特性的属性。
+         */
+        baidu.browser = baidu.browser || {};
+
+        if (/msie (\d+\.\d)/i.test(navigator.userAgent)) {
+            //IE 8下，以documentMode为准
+            //在百度模板中，可能会有$，防止冲突，将$1 写成 \x241
+            /**
+             * 判断是否为ie浏览器
+             * @property ie ie版本号
+             * @grammar baidu.browser.ie
+             * @meta standard
+             * @shortcut ie
+             * @see baidu.browser.firefox,baidu.browser.safari,baidu.browser.opera,baidu.browser.chrome,baidu.browser.maxthon 
+             */
+           baidu.browser.ie = baidu.ie = document.documentMode || + RegExp['\x241'];
+        }
+
+        /**
+         * 获取目标元素的computed style值。如果元素的样式值不能被浏览器计算，则会返回空字符串（IE）
+         *
+         * @author berg
+         * @name baidu.dom.getComputedStyle
+         * @function
+         * @grammar baidu.dom.getComputedStyle(element, key)
+         * @param {HTMLElement|string} element 目标元素或目标元素的id
+         * @param {string} key 要获取的样式名
+         *
+         * @see baidu.dom.getStyle
+         *             
+         * @returns {string} 目标元素的computed style值
+         */
+
+        baidu.dom.getComputedStyle = function(element, key){
+            element = baidu.dom._g(element);
+            var doc = baidu.dom.getDocument(element),
+                styles;
+            if (doc.defaultView && doc.defaultView.getComputedStyle) {
+                styles = doc.defaultView.getComputedStyle(element, null);
+                if (styles) {
+                    return styles[key] || styles.getPropertyValue(key);
+                }
+            }
+            return ''; 
+        };
+
+        /**
+         * 提供给setStyle与getStyle使用
+         */
+        baidu.dom._styleFixer = baidu.dom._styleFixer || {};
+
+        /**
+         * 提供给setStyle与getStyle使用
+         */
+        baidu.dom._styleFilter = baidu.dom._styleFilter || [];
+
+        /**
+         * 为获取和设置样式的过滤器
+         * @private
+         * @meta standard
+         */
+        baidu.dom._styleFilter.filter = function (key, value, method) {
+            for (var i = 0, filters = baidu.dom._styleFilter, filter; filter = filters[i]; i++) {
+                if (filter = filter[method]) {
+                    value = filter(key, value);
+                }
+            }
+            return value;
+        };
+
+        /**
+           * @ignore
+         * @namespace baidu.string 操作字符串的方法。
+         */
+        baidu.string = baidu.string || {};
+
+        /**
+         * 将目标字符串进行驼峰化处理
+         * @name baidu.string.toCamelCase
+         * @function
+         * @grammar baidu.string.toCamelCase(source)
+         * @param {string} source 目标字符串
+         * @remark
+         * 支持单词以“-_”分隔
+         * @meta standard
+         *             
+         * @returns {string} 驼峰化处理后的字符串
+         */
+        baidu.string.toCamelCase = function (source) {
+            //提前判断，提高getStyle等的效率 thanks xianwei
+            if (source.indexOf('-') < 0 && source.indexOf('_') < 0) {
+                return source;
+            }
+            return source.replace(/[-_][^-_]/g, function (match) {
+                return match.charAt(1).toUpperCase();
+            });
+        };
+
+        /**
+         * 获取目标元素的样式值
+         * @name baidu.dom.getStyle
+         * @function
+         * @grammar baidu.dom.getStyle(element, key)
+         * @param {HTMLElement|string} element 目标元素或目标元素的id
+         * @param {string} key 要获取的样式名
+         * @remark
+         * 
+         * 为了精简代码，本模块默认不对任何浏览器返回值进行归一化处理（如使用getStyle时，不同浏览器下可能返回rgb颜色或hex颜色），也不会修复浏览器的bug和差异性（如设置IE的float属性叫styleFloat，firefox则是cssFloat）。<br />
+         * baidu.dom._styleFixer和baidu.dom._styleFilter可以为本模块提供支持。<br />
+         * 其中_styleFilter能对颜色和px进行归一化处理，_styleFixer能对display，float，opacity，textOverflow的浏览器兼容性bug进行处理。	
+         * @shortcut getStyle
+         * @meta standard
+         * @see baidu.dom.setStyle,baidu.dom.setStyles, baidu.dom.getComputedStyle
+         *             
+         * @returns {string} 目标元素的样式值
+         */
+        baidu.dom.getStyle = function (element, key) {
+            var dom = baidu.dom;
+
+            element = dom.g(element);
+            key = baidu.string.toCamelCase(key);
+            //computed style, then cascaded style, then explicitly set style.
+            var value = element.style[key] ||
+                        (element.currentStyle ? element.currentStyle[key] : "") || 
+                        dom.getComputedStyle(element, key);
+
+            // 在取不到值的时候，用fixer进行修正
+            if (!value) {
+                var fixer = dom._styleFixer[key];
+                if(fixer){
+                    value = fixer.get ? fixer.get(element) : baidu.dom.getStyle(element, fixer);
+                }
+            }
+    
+            /* 检查结果过滤器 */
+            if (fixer = dom._styleFilter) {
+                value = fixer.filter(key, value, 'get');
+            }
+
+            return value;
+        };
+
+        // 声明快捷方法
+        baidu.getStyle = baidu.dom.getStyle;
+
+
+        if (/opera\/(\d+\.\d)/i.test(navigator.userAgent)) {
+        /**
+         * 判断是否为opera浏览器
+         * @property opera opera版本号
+         * @grammar baidu.browser.opera
+         * @meta standard
+         * @see baidu.browser.ie,baidu.browser.firefox,baidu.browser.safari,baidu.browser.chrome 
+         */
+            baidu.browser.opera = + RegExp['\x241'];
+        }
+
+        /**
+         * 判断是否为webkit内核
+         * @property isWebkit 
+         * @grammar baidu.browser.isWebkit
+         * @meta standard
+         * @see baidu.browser.isGecko
+         */
+        baidu.browser.isWebkit = /webkit/i.test(navigator.userAgent);
+
+        /**
+         * 判断是否为gecko内核
+         * @property isGecko 
+         * @grammar baidu.browser.isGecko
+         * @meta standard
+         * @see baidu.browser.isWebkit
+         */
+        baidu.browser.isGecko = /gecko/i.test(navigator.userAgent) && !/like gecko/i.test(navigator.userAgent);
+
+        /**
+         * 判断是否严格标准的渲染模式
+         * @property isStrict 
+         * @grammar baidu.browser.isStrict
+         * @meta standard
+         */
+        baidu.browser.isStrict = document.compatMode == "CSS1Compat";
+
+        /**
+         * 获取目标元素相对于整个文档左上角的位置
+         * @name baidu.dom.getPosition
+         * @function
+         * @grammar baidu.dom.getPosition(element)
+         * @param {HTMLElement|string} element 目标元素或目标元素的id
+         * @meta standard
+         *             
+         * @returns {Object} 目标元素的位置，键值为top和left的Object。
+         */
+        baidu.dom.getPosition = function (element) {
+            element = baidu.dom.g(element);
+            var doc = baidu.dom.getDocument(element), 
+                browser = baidu.browser,
+                getStyle = baidu.dom.getStyle,
+            // Gecko 1.9版本以下用getBoxObjectFor计算位置
+            // 但是某些情况下是有bug的
+            // 对于这些有bug的情况
+            // 使用递归查找的方式
+                BUGGY_GECKO_BOX_OBJECT = browser.isGecko > 0 && 
+                                         doc.getBoxObjectFor &&
+                                         getStyle(element, 'position') == 'absolute' &&
+                                         (element.style.top === '' || element.style.left === ''),
+                pos = {"left":0,"top":0},
+                viewport = (browser.ie && !browser.isStrict) ? doc.body : doc.documentElement,
+                parent,
+                box;
+    
+            if(element == viewport){
+                return pos;
+            }
+
+            if(element.getBoundingClientRect){ // IE and Gecko 1.9+
+        
+                //当HTML或者BODY有border width时, 原生的getBoundingClientRect返回值是不符合预期的
+                //考虑到通常情况下 HTML和BODY的border只会设成0px,所以忽略该问题.
+                box = element.getBoundingClientRect();
+
+                pos.left = Math.floor(box.left) + Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft);
+                pos.top  = Math.floor(box.top)  + Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop);
+        
+                // IE会给HTML元素添加一个border，默认是medium（2px）
+                // 但是在IE 6 7 的怪异模式下，可以被html { border: 0; } 这条css规则覆盖
+                // 在IE7的标准模式下，border永远是2px，这个值通过clientLeft 和 clientTop取得
+                // 但是。。。在IE 6 7的怪异模式，如果用户使用css覆盖了默认的medium
+                // clientTop和clientLeft不会更新
+                pos.left -= doc.documentElement.clientLeft;
+                pos.top  -= doc.documentElement.clientTop;
+        
+                var htmlDom = doc.body,
+                    // 在这里，不使用element.style.borderLeftWidth，只有computedStyle是可信的
+                    htmlBorderLeftWidth = parseInt(getStyle(htmlDom, 'borderLeftWidth')),
+                    htmlBorderTopWidth = parseInt(getStyle(htmlDom, 'borderTopWidth'));
+                if(browser.ie && !browser.isStrict){
+                    pos.left -= isNaN(htmlBorderLeftWidth) ? 2 : htmlBorderLeftWidth;
+                    pos.top  -= isNaN(htmlBorderTopWidth) ? 2 : htmlBorderTopWidth;
+                }
+            } else { 
+                // safari/opera/firefox
+                parent = element;
+
+                do {
+                    pos.left += parent.offsetLeft;
+                    pos.top  += parent.offsetTop;
+      
+                    // safari里面，如果遍历到了一个fixed的元素，后面的offset都不准了
+                    if (browser.isWebkit > 0 && getStyle(parent, 'position') == 'fixed') {
+                        pos.left += doc.body.scrollLeft;
+                        pos.top  += doc.body.scrollTop;
+                        break;
+                    }
+            
+                    parent = parent.offsetParent;
+                } while (parent && parent != element);
+
+                // 对body offsetTop的修正
+                if(browser.opera > 0 || (browser.isWebkit > 0 && getStyle(element, 'position') == 'absolute')){
+                    pos.top  -= doc.body.offsetTop;
+                }
+
+                // 计算除了body的scroll
+                parent = element.offsetParent;
+                while (parent && parent != doc.body) {
+                    pos.left -= parent.scrollLeft;
+                    // see https://bugs.opera.com/show_bug.cgi?id=249965
+                    if (!browser.opera || parent.tagName != 'TR') {
+                        pos.top -= parent.scrollTop;
+                    }
+                    parent = parent.offsetParent;
+                }
+            }
+
+            return pos;
+        };
+
+        /**
+         * @ignore
+         * @namespace baidu.event 屏蔽浏览器差异性的事件封装。
+         * @property target 	事件的触发元素
+         * @property pageX 		鼠标事件的鼠标x坐标
+         * @property pageY 		鼠标事件的鼠标y坐标
+         * @property keyCode 	键盘事件的键值
+         */
+        baidu.event = baidu.event || {};
+
+        /**
+         * 事件监听器的存储表
+         * @private
+         * @meta standard
+         */
+        baidu.event._listeners = baidu.event._listeners || [];
+
+        /**
+         * 为目标元素添加事件监听器
+         * @name baidu.event.on
+         * @function
+         * @grammar baidu.event.on(element, type, listener)
+         * @param {HTMLElement|string|window} element 目标元素或目标元素id
+         * @param {string} type 事件类型
+         * @param {Function} listener 需要添加的监听器
+         * @remark
+         * 
+        1. 不支持跨浏览器的鼠标滚轮事件监听器添加<br>
+        2. 改方法不为监听器灌入事件对象，以防止跨iframe事件挂载的事件对象获取失败
+    
+         * @shortcut on
+         * @meta standard
+         * @see baidu.event.un
+         *             
+         * @returns {HTMLElement|window} 目标元素
+         */
+        baidu.event.on = function (element, type, listener) {
+            type = type.replace(/^on/i, '');
+            element = baidu.dom._g(element);
+
+            var realListener = function (ev) {
+                    // 1. 这里不支持EventArgument,  原因是跨frame的事件挂载
+                    // 2. element是为了修正this
+                    listener.call(element, ev);
+                },
+                lis = baidu.event._listeners,
+                filter = baidu.event._eventFilter,
+                afterFilter,
+                realType = type;
+            type = type.toLowerCase();
+            // filter过滤
+            if(filter && filter[type]){
+                afterFilter = filter[type](element, type, realListener);
+                realType = afterFilter.type;
+                realListener = afterFilter.listener;
+            }
+    
+            // 事件监听器挂载
+            if (element.addEventListener) {
+                element.addEventListener(realType, realListener, false);
+            } else if (element.attachEvent) {
+                element.attachEvent('on' + realType, realListener);
+            }
+  
+            // 将监听器存储到数组中
+            lis[lis.length] = [element, type, listener, realListener, realType];
+            return element;
+        };
+
+        // 声明快捷方法
+        baidu.on = baidu.event.on;
+
+        /**
+         * 返回一个当前页面的唯一标识字符串。
+         * @name baidu.lang.guid
+         * @function
+         * @grammar baidu.lang.guid()
+         * @version 1.1.1
+         * @meta standard
+         *             
+         * @returns {String} 当前页面的唯一标识字符串
+         */
+
+        (function(){
+            //不直接使用window，可以提高3倍左右性能
+            var guid = window[baidu.guid];
+
+            baidu.lang.guid = function() {
+                return "TANGRAM__" + (guid._counter ++).toString(36);
+            };
+
+            guid._counter = guid._counter || 1;
+        })();
+
+        /**
+         * 所有类的实例的容器
+         * key为每个实例的guid
+         * @meta standard
+         */
+
+        window[baidu.guid]._instances = window[baidu.guid]._instances || {};
+
+        /**
+         * 判断目标参数是否为function或Function实例
+         * @name baidu.lang.isFunction
+         * @function
+         * @grammar baidu.lang.isFunction(source)
+         * @param {Any} source 目标参数
+         * @version 1.2
+         * @see baidu.lang.isString,baidu.lang.isObject,baidu.lang.isNumber,baidu.lang.isArray,baidu.lang.isElement,baidu.lang.isBoolean,baidu.lang.isDate
+         * @meta standard
+         * @returns {boolean} 类型判断结果
+         */
+        baidu.lang.isFunction = function (source) {
+            // chrome下,'function' == typeof /a/ 为true.
+            return '[object Function]' == Object.prototype.toString.call(source);
+        };
+
+        /**
+         *    
+         * @ignore
+         * @class  Tangram继承机制提供的一个基类，用户可以通过继承baidu.lang.Class来获取它的属性及方法。
+         * @name 	baidu.lang.Class
+         * @grammar baidu.lang.Class(guid)
+         * @param 	{string}	guid	对象的唯一标识
+         * @meta standard
+         * @remark baidu.lang.Class和它的子类的实例均包含一个全局唯一的标识guid。guid是在构造函数中生成的，因此，继承自baidu.lang.Class的类应该直接或者间接调用它的构造函数。<br>baidu.lang.Class的构造函数中产生guid的方式可以保证guid的唯一性，及每个实例都有一个全局唯一的guid。
+         * @meta standard
+         * @see baidu.lang.inherits,baidu.lang.Event
+         */
+        baidu.lang.Class = function(guid) {
+            this.guid = guid || baidu.lang.guid();
+            window[baidu.guid]._instances[this.guid] = this;
+        };
+        window[baidu.guid]._instances = window[baidu.guid]._instances || {};
+
+        /**
+         * 释放对象所持有的资源，主要是自定义事件。
+         * @name dispose
+         * @grammar obj.dispose()
+         */
+        baidu.lang.Class.prototype.dispose = function(){
+            delete window[baidu.guid]._instances[this.guid];
+
+            for(var property in this){
+                if (!baidu.lang.isFunction(this[property])) {
+                    delete this[property];
+                }
+            }
+            this.disposed = true;
+        };
+
+        /**
+         * 重载了默认的toString方法，使得返回信息更加准确一些。
+         * @return {string} 对象的String表示形式
+         */
+        baidu.lang.Class.prototype.toString = function(){
+            return "[object " + (this._className || "Object" ) + "]";
+        };
+
+        /**
+         * @ignore
+         * @class   自定义的事件对象。
+         * @name 	baidu.lang.Event
+         * @grammar baidu.lang.Event(type[, target])
+         * @param 	{string} type	 事件类型名称。为了方便区分事件和一个普通的方法，事件类型名称必须以"on"(小写)开头。
+         * @param 	{Object} [target]触发事件的对象
+         * @meta standard
+         * @remark 引入该模块，会自动为Class引入3个事件扩展方法：addEventListener、removeEventListener和dispatchEvent。
+         * @meta standard
+         * @see baidu.lang.Class
+         */
+        baidu.lang.Event = function (type, target) {
+            this.type = type;
+            this.returnValue = true;
+            this.target = target || null;
+            this.currentTarget = null;
+        };
+
+        /**
+         * 注册对象的事件监听器。引入baidu.lang.Event后，Class的子类实例才会获得该方法。
+         * @grammar obj.addEventListener(type, handlers[, key])
+         * @param 	{string}   type         自定义事件的名称
+         * @param 	{Function} handler      自定义事件被触发时应该调用的回调函数
+         * @param 	{string}   [key]		为事件监听函数指定的名称，可在移除时使用。如果不提供，方法会默认为它生成一个全局唯一的key。
+         * @remark 	事件类型区分大小写。如果自定义事件名称不是以小写"on"开头，该方法会给它加上"on"再进行判断，即"click"和"onclick"会被认为是同一种事件。 
+         */
+        baidu.lang.Class.prototype.addEventListener = function (type, handler, key) {
+            if (!baidu.lang.isFunction(handler)) {
+                return;
+            }
+
+            !this.__listeners && (this.__listeners = {});
+
+            var t = this.__listeners, id;
+            if (typeof key == "string" && key) {
+                if (/[^\w\-]/.test(key)) {
+                    throw("nonstandard key:" + key);
+                } else {
+                    handler.hashCode = key; 
+                    id = key;
+                }
+            }
+            type.indexOf("on") != 0 && (type = "on" + type);
+
+            typeof t[type] != "object" && (t[type] = {});
+            id = id || baidu.lang.guid();
+            handler.hashCode = id;
+            t[type][id] = handler;
+        };
+ 
+        /**
+         * 移除对象的事件监听器。引入baidu.lang.Event后，Class的子类实例才会获得该方法。
+         * @grammar obj.removeEventListener(type, handlers)
+         * @param {string}   type     事件类型
+         * @param {Function|string} handler  要移除的事件监听函数或者监听函数的key
+         * @remark 	如果第二个参数handler没有被绑定到对应的自定义事件中，什么也不做。
+         */
+        baidu.lang.Class.prototype.removeEventListener = function (type, handler) {
+            if (typeof handler != "undefined") {
+                if ( (baidu.lang.isFunction(handler) && ! (handler = handler.hashCode))
+                    || (! baidu.lang.isString(handler))
+                ){
+                    return;
+                }
+            }
+
+            !this.__listeners && (this.__listeners = {});
+
+            type.indexOf("on") != 0 && (type = "on" + type);
+
+            var t = this.__listeners;
+            if (!t[type]) {
+                return;
+            }
+            if (typeof handler != "undefined") {
+                t[type][handler] && delete t[type][handler];
+            } else {
+                for(var guid in t[type]){
+                    delete t[type][guid];
+                }
+            }
+        };
+
+        /**
+         * 派发自定义事件，使得绑定到自定义事件上面的函数都会被执行。引入baidu.lang.Event后，Class的子类实例才会获得该方法。
+         * @grammar obj.dispatchEvent(event, options)
+         * @param {baidu.lang.Event|String} event 	Event对象，或事件名称(1.1.1起支持)
+         * @param {Object} 					options 扩展参数,所含属性键值会扩展到Event对象上(1.2起支持)
+         * @remark 处理会调用通过addEventListenr绑定的自定义事件回调函数之外，还会调用直接绑定到对象上面的自定义事件。例如：<br>
+        myobj.onMyEvent = function(){}<br>
+        myobj.addEventListener("onMyEvent", function(){});
+         */
+        baidu.lang.Class.prototype.dispatchEvent = function (event, options) {
+            if (baidu.lang.isString(event)) {
+                event = new baidu.lang.Event(event);
+            }
+            !this.__listeners && (this.__listeners = {});
+
+            // 20100603 添加本方法的第二个参数，将 options extend到event中去传递
+            options = options || {};
+            for (var i in options) {
+                event[i] = options[i];
+            }
+
+            var i, t = this.__listeners, p = event.type;
+            event.target = event.target || this;
+            event.currentTarget = this;
+
+            p.indexOf("on") != 0 && (p = "on" + p);
+
+            baidu.lang.isFunction(this[p]) && this[p].apply(this, arguments);
+
+            if (typeof t[p] == "object") {
+                for (i in t[p]) {
+                    t[p][i].apply(this, arguments);
+                }
+            }
+            return event.returnValue;
+        };
+
+
+        baidu.lang.inherits = function (subClass, superClass, className) {
+            var key, proto,
+                selfProps = subClass.prototype,
+                clazz = new Function();
+
+            clazz.prototype = superClass.prototype;
+            proto = subClass.prototype = new clazz();
+            for (key in selfProps) {
+                proto[key] = selfProps[key];
+            }
+            subClass.prototype.constructor = subClass;
+            subClass.superClass = superClass.prototype;
+
+            // 类名标识，兼容Class的toString，基本没用
+            if ("string" == typeof className) {
+                proto._className = className;
+            }
+        };
+        // 声明快捷方法
+        baidu.inherits = baidu.lang.inherits;
+    })();
+
+
+    /**
+    
+     * 图片的路径
+
+     * @private
+     * @type {String}
+    
+     */
+    var _IMAGE_PATH = '//api.map.baidu.com/library/TextIconOverlay/1.2/src/images/m';
+
+    /**
+    
+     * 图片的后缀名
+
+      * @private
+     * @type {String}
+    
+     */
+    var _IMAGE_EXTENSION  = 'png';
+
+    /**
+     *@exports TextIconOverlay as BMapLib.TextIconOverlay
+     */
+    var TextIconOverlay = 
+        /**
+        * TextIconOverlay
+        * @class 此类表示地图上的一个覆盖物，该覆盖物由文字和图标组成，从Overlay继承。文字通常是数字（0-9）或字母（A-Z ），而文字与图标之间有一定的映射关系。
+        *该覆盖物适用于以下类似的场景：需要在地图上添加一系列覆盖物，这些覆盖物之间用不同的图标和文字来区分，文字可能表示了该覆盖物的某一属性值，根据该文字和一定的映射关系，自动匹配相应颜色和大小的图标。
+        *
+        *@constructor
+        *@param {Point} position 表示一个经纬度坐标位置。
+        *@param {String} text 表示该覆盖物显示的文字信息。
+        *@param {Json Object} options 可选参数，可选项包括：<br />
+        *"<b>styles</b>":{Array<IconStyle>} 一组图标风格。单个图表风格包括以下几个属性：<br />
+        *   url	{String}	 图片的url地址。(必选)<br />
+        *   size {Size}	图片的大小。（必选）<br />
+        *   anchor {Size} 图标定位在地图上的位置相对于图标左上角的偏移值，默认偏移值为图标的中心位置。（可选）<br />
+        *   offset {Size} 图片相对于可视区域的偏移值，此功能的作用等同于CSS中的background-position属性。（可选）<br />
+        *   textSize {Number} 文字的大小。（可选，默认10）<br />
+        *   textColor {String} 文字的颜色。（可选，默认black）<br />
+        */
+        BMapLib.TextIconOverlay = function(position, text, options){
+            this._position = position;
+            this._text = text;
+            this._options = options || {};
+            this._styles = this._options['styles'] || [];
+            (!this._styles.length) && this._setupDefaultStyles();                  
+        };
+
+    T.lang.inherits(TextIconOverlay, BMap.Overlay, "TextIconOverlay");
+
+    TextIconOverlay.prototype._setupDefaultStyles = function(){  
+        var sizes = [53, 56, 66, 78, 90];
+        for(var i = 0, size; size = sizes[i]; i++){
+            this._styles.push({
+                url:_IMAGE_PATH + i + '.' + _IMAGE_EXTENSION,
+                size: new BMap.Size(size, size)
+            });
+        }//for循环的简洁写法
+    };
+
+    /**
+    *继承Overlay的intialize方法，自定义覆盖物时必须。
+    *@param {Map} map BMap.Map的实例化对象。
+    *@return {HTMLElement} 返回覆盖物对应的HTML元素。
+    */
+    TextIconOverlay.prototype.initialize = function(map){
+        this._map = map;
+    
+        this._domElement = document.createElement('div');     
+        this._updateCss();    
+        this._updateText();
+        this._updatePosition(); 
+        
+        this._bind();
+
+        this._map.getPanes().markerMouseTarget.appendChild(this._domElement);
+        return this._domElement;   
+    };
+
+    /**
+    *继承Overlay的draw方法，自定义覆盖物时必须。
+    *@return 无返回值。
+    */
+    TextIconOverlay.prototype.draw = function(){
+        this._map && this._updatePosition();
+    };
+    
+    /**
+    *获取该覆盖物上的文字。
+    *@return {String} 该覆盖物上的文字。
+    */
+    TextIconOverlay.prototype.getText = function(){
+        return this._text;
+    };
+
+    /**
+    *设置该覆盖物上的文字。
+    *@param {String} text 要设置的文字，通常是字母A-Z或数字0-9。
+    *@return 无返回值。
+    */
+    TextIconOverlay.prototype.setText = function(text){
+        if(text && (!this._text || (this._text.toString() != text.toString()))){
+            this._text = text;
+            this._updateText();
+            this._updateCss();
+            this._updatePosition(); 
+        }
+    };
+
+    /**
+    *获取该覆盖物的位置。
+    *@return {Point} 该覆盖物的经纬度坐标。
+    */
+    TextIconOverlay.prototype.getPosition = function () {
+        return this._position;
+    };
+   
+    /**
+    *设置该覆盖物的位置。
+    *@param {Point}  position 要设置的经纬度坐标。
+    *@return 无返回值。
+    */
+    TextIconOverlay.prototype.setPosition = function (position) {
+        if(position && (!this._position || !this._position.equals(position))){
+            this._position = position;  
+            this._updatePosition();
+        }
+    };
+
+    /**
+    *由文字信息获取风格数组的对应索引值。
+    *内部默认的对应函数为文字转换为数字除以10的结果，比如文字8返回索引0，文字25返回索引2.
+    *如果需要自定义映射关系，请覆盖该函数。
+    *@param {String} text  文字。
+    *@param {Array<IconStyle>}  styles 一组图标风格。
+    *@return {Number} 对应的索引值。
+    */
+    TextIconOverlay.prototype.getStyleByText = function(text, styles){
+        var count = parseInt(text);
+        var index = parseInt(count / 10);
+        index = Math.max(0, index);
+        index = Math.min(index, styles.length - 1);
+        return styles[index]; 
+    }
+
+    /**
+    *更新相应的CSS。
+    *@return 无返回值。
+    */
+    TextIconOverlay.prototype._updateCss = function(){
+        var style = this.getStyleByText(this._text, this._styles);
+        this._domElement.style.cssText = this._buildCssText(style);
+    };
+
+    /**
+    *更新覆盖物的显示文字。
+    *@return 无返回值。
+    */
+    TextIconOverlay.prototype._updateText = function(){
+        if (this._domElement) {
+            this._domElement.innerHTML = this._text;
+        }
+    };
+
+    /**
+    *调整覆盖物在地图上的位置更新覆盖物的显示文字。
+    *@return 无返回值。
+    */
+    TextIconOverlay.prototype._updatePosition = function(){
+        if (this._domElement && this._position) {
+            var style = this._domElement.style;
+            var pixelPosition= this._map.pointToOverlayPixel(this._position); 
+            pixelPosition.x -= Math.ceil(parseInt(style.width) / 2);
+            pixelPosition.y -= Math.ceil(parseInt(style.height) / 2);       
+            style.left = pixelPosition.x + "px";
+            style.top = pixelPosition.y + "px";
+        }
+    };
+    
+    /**
+    * 为该覆盖物的HTML元素构建CSS
+    * @param {IconStyle}  一个图标的风格。
+    * @return {String} 构建完成的CSSTEXT。
+    */
+    TextIconOverlay.prototype._buildCssText = function(style) {    
+        //根据style来确定一些默认值
+        var url = style['url'];
+        var size = style['size'];
+        var anchor = style['anchor'];
+        var offset = style['offset'];
+        var textColor = style['textColor'] || 'black';
+        var textSize = style['textSize'] || 10;
+
+        var csstext = [];
+        if (T.browser["ie"] < 7) {
+            csstext.push('filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(' +
+                'sizingMethod=scale,src="' + url + '");');
+        } else {
+            csstext.push('background-image:url(' + url + ');');
+            var backgroundPosition = '0 0';
+            (offset instanceof BMap.Size) && (backgroundPosition = offset.width + 'px' + ' ' + offset.height + 'px');          
+            csstext.push('background-position:' + backgroundPosition + ';');
+        }
+
+        if (size instanceof BMap.Size){
+            if (anchor instanceof BMap.Size) {
+                if (anchor.height > 0 && anchor.height < size.height) {
+                      csstext.push('height:' + (size.height - anchor.height) + 'px; padding-top:' + anchor.height + 'px;');
+                }
+                if(anchor.width > 0 && anchor.width < size.width){
+                    csstext.push('width:' + (size.width - anchor.width) + 'px; padding-left:' + anchor.width + 'px;');                
+                }
+            } else {
+                csstext.push('height:' + size.height + 'px; line-height:' + size.height + 'px;');
+                csstext.push('width:' + size.width + 'px; text-align:center;');
+            }
+        }
+   
+        csstext.push('cursor:pointer; color:' + textColor + '; position:absolute; font-size:' +
+            textSize + 'px; font-family:Arial,sans-serif; font-weight:bold');
+        return csstext.join('');
+    };
+
+
+    /**
+    
+     * 当鼠标点击该覆盖物时会触发该事件
+
+     * @name TextIconOverlay#click
+
+     * @event
+
+     * @param {Event Object} e 回调函数会返回event参数，包括以下返回值：
+    
+     * <br />"<b>type</b> : {String} 事件类型
+
+     * <br />"<b>target</b>：{BMapLib.TextIconOverlay} 事件目标
+
+     *
+
+     */
+
+    /**
+
+     * 当鼠标进入该覆盖物区域时会触发该事件
+
+     * @name TextIconOverlay#mouseover
+
+     * @event
+     * @param {Event Object} e 回调函数会返回event参数，包括以下返回值：
+    
+     * <br />"<b>type</b> : {String} 事件类型
+
+     * <br />"<b>target</b>：{BMapLib.TextIconOverlay} 事件目标
+
+     * <br />"<b>point</b> : {BMap.Point} 最新添加上的节点BMap.Point对象
+
+     * <br />"<b>pixel</b>：{BMap.pixel} 最新添加上的节点BMap.Pixel对象
+
+     *
+
+     * @example <b>参考示例：</b><br />
+
+     * myTextIconOverlay.addEventListener("mouseover", function(e) {  alert(e.point);  });
+
+     */
+
+    /**
+
+     * 当鼠标离开该覆盖物区域时会触发该事件
+
+     * @name TextIconOverlay#mouseout
+
+     * @event
+
+     * @param {Event Object} e 回调函数会返回event参数，包括以下返回值：
+
+     * <br />"<b>type</b> : {String} 事件类型
+
+     * <br />"<b>target</b>：{BMapLib.TextIconOverlay} 事件目标
+
+     * <br />"<b>point</b> : {BMap.Point} 最新添加上的节点BMap.Point对象
+
+     * <br />"<b>pixel</b>：{BMap.pixel} 最新添加上的节点BMap.Pixel对象
+
+     *
+
+     * @example <b>参考示例：</b><br />
+
+     * myTextIconOverlay.addEventListener("mouseout", function(e) {  alert(e.point);  });
+
+     */
+
+
+    /**
+    * 为该覆盖物绑定一系列事件
+    * 当前支持click mouseover mouseout
+    * @return 无返回值。
+    */
+    TextIconOverlay.prototype._bind = function(){
+        if (!this._domElement){
+            return;
+        }
+
+        var me = this;
+        var map = this._map;
+
+        var BaseEvent = T.lang.Event;
+        function eventExtend(e, be){
+            var elem = e.srcElement || e.target;
+            var x = e.clientX || e.pageX;
+            var y = e.clientY || e.pageY;
+            if (e && be && x && y && elem){
+                var offset = T.dom.getPosition(map.getContainer());
+                be.pixel = new BMap.Pixel(x - offset.left, y - offset.top);
+                be.point = map.pixelToPoint(be.pixel);
+            }
+            return be;
+        }//给事件参数增加pixel和point两个值
+
+        T.event.on(this._domElement,"mouseover", function(e){
+            me.dispatchEvent(eventExtend(e, new BaseEvent("onmouseover")));
+        });
+        T.event.on(this._domElement,"mouseout", function(e){
+            me.dispatchEvent(eventExtend(e, new BaseEvent("onmouseout")));
+        });
+        T.event.on(this._domElement,"click", function(e){
+            me.dispatchEvent(eventExtend(e, new BaseEvent("onclick")));
+        });
+    };
+
 })();
 \ No newline at end of file