1.CSP header

2.密码验证、强制更新弱密码，管理员重置密码，解锁账号 3.白名单套装 4.密码错误多次锁定账号

1.CSP header
2.密码验证、强制更新弱密码，管理员重置密码，解锁账号 3.白名单套装 4.密码错误多次锁定账号
王通
1 parent ca0c3273
Showing 28 changed files with 2681 additions and 1273 deletions
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/common/SystemParamKeys.java
src/main/java/com/bsth/controller/realcontrol/AdminUtilsController.java
src/main/java/com/bsth/controller/sys/RoleController.java
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/data/SystemParamCache.java
src/main/java/com/bsth/data/WhiteIpCache.java
src/main/java/com/bsth/data/directive/GatewayHttpUtils.java
src/main/java/com/bsth/data/gpsdata_v2/load/GatewayHttpLoader.java
src/main/java/com/bsth/data/gpsdata_v2/load/SocketClientLoader.java
src/main/java/com/bsth/entity/sys/Role.java
src/main/java/com/bsth/entity/sys/SysUser.java
src/main/java/com/bsth/filter/AuthorityFilter.java
src/main/java/com/bsth/filter/BaseFilter.java
src/main/java/com/bsth/filter/WhiteIpFilter.java
src/main/java/com/bsth/repository/sys/RoleRepository.java
src/main/java/com/bsth/repository/sys/SysUserRepository.java
src/main/java/com/bsth/security/WebSecurityConfig.java
src/main/java/com/bsth/service/SystemParamService.java
-package com.bsth;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.context.web.SpringBootServletInitializer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Primary;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-
-@EnableTransactionManagement
-@SpringBootApplication
-public class Application extends SpringBootServletInitializer {
-	
-	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(18);
-
-	@Override
-	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-		return application.sources(Application.class);
-	}
-
-	@Bean
-	@Primary
-	public ObjectMapper objectMapper() {
-		ObjectMapper objectMapper = new ObjectMapper();
-		objectMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
-
-		return objectMapper;
-	}
-
-	public static void main(String[] args) throws Exception {
-		SpringApplication.run(Application.class, args);
-	}
+package com.bsth;
+
+import com.bsth.data.SystemParamCache;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.context.web.SpringBootServletInitializer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+
+@EnableTransactionManagement
+@SpringBootApplication
+public class Application extends SpringBootServletInitializer {
+	
+	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(21);
+
+	@Autowired
+	private SystemParamCache systemParamCache;
+
+	@Override
+	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+		return application.sources(Application.class);
+	}
+
+	@Bean
+	@Primary
+	public ObjectMapper objectMapper() {
+		ObjectMapper objectMapper = new ObjectMapper();
+		objectMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+
+		return objectMapper;
+	}
+
+	public static void main(String[] args) throws Exception {
+		SpringApplication.run(Application.class, args);
+	}
 }
 \ No newline at end of file
-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";
-	public static final String XIANDIAO_LOGIN = "/xdlogin.html";
-	public static final String IPAD_IMG_URL = "/apple-touch-icon-72x72.png";
-
-	//对外的营运数据接口
-	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 ";
-}
+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 ORIGINAL_LOGIN_PAGE = "/login.html";
+	public static 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";
+	public static final String XIANDIAO_LOGIN = "/xdlogin.html";
+	public static final String IPAD_IMG_URL = "/apple-touch-icon-72x72.png";
+
+	//对外的营运数据接口
+	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";
+
+	public static final String SSO_TOKEN = "ssoToken";
+
+	public static final String RESOURCE_AUTHORITYS = "resourceAuthoritys";
+}
+package com.bsth.common;
+
+/**
+ * @author Hill
+ */
+public class SystemParamKeys {
+
+    public static final String SPECIAL_ROLES = "special.roles";
+
+    public static final String SPECIAL_DAYS = "special.days";
+
+    public static final String URL_HTTP_GPS_REAL_CACHE = "url.http.gps.real.cache";
+
+    public static final String URL_HTTP_GPS_REAL = "url.http.gps.real";
+
+    public static final String URL_HTTP_DIRECTIVE = "url.http.directive";
+
+    public static final String URL_HTTP_RFID = "url.http.rfid";
+
+    public static final String URL_HTTP_REPORT = "url.http.report.%s";
+
+    public static final String URL_HTTP_TICKETING = "url.http.ticketing";
+
+    public static final String URL_HTTP_DSM_ACK = "url.http.dsm.ack";
+
+    public static final String URL_HTTP_CP_ACK = "url.http.cp.ack";
+
+    public static final String MAIL_ADMIN = "mail.admin";
+
+    public static final String MAIL_WAYBILL = "mail.waybill";
+
+    public static final String ENABLED_FIRST_LAST_GENERATION = "enabled.first.last.generation";
+
+    public static final String ENABLED_FILTER_SQL_INJECTION = "enabled.filter.sql.injection";
+
+    public static final String ENABLED_SSO = "enabled.sso";
+
+    public static final String SSO_SYSTEM_CODE = "sso.system.code";
+
+    public static final String URL_HTTP_SSO_LOGIN = "url.http.sso.login";
+
+    public static final String URL_HTTP_SSO_LOGOUT = "url.http.sso.logout";
+
+    public static final String URL_HTTP_SSO_AUTH = "url.http.sso.auth";
+
+    public static final String URL_HTTP_MAINTENANCE = "url.http.maintenance";
+
+    public static final String ENABLED_WHITE_IP = "enabled.white.ip";
+
+    public static final String ENABLED_FILTER_AUTHORITY = "enabled.filter.authority";
+
+    public static final String URL_HTTP_DVR = "url.http.dvr";
+
+    public static final String URL_HTTP_DVR_PWD = "url.http.dvr.pwd";
+}
 \ No newline at end of file
 package com.bsth.controller.realcontrol;
  
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.LoggerContext;
+import java.util.*;
+
 import com.bsth.data.BasicData;
+import com.bsth.service.SectionService;
+import com.bsth.service.StationService;
 import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.directive.DirectivesPstThread;
+import com.bsth.data.directive.GatewayHttpUtils;
 import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
 import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
+import com.bsth.data.gpsdata_v2.load.GatewayHttpLoader;
+import com.bsth.data.gpsdata_v2.load.SocketClientLoader;
 import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
 import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.msg_queue.WebSocketPushQueue;
 import com.bsth.data.pilot80.PilotReport;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.websocket.handler.SendUtils;
+import com.bsth.service.SystemParamService;
+import com.bsth.util.MailUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,10 +28,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
  
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import com.bsth.websocket.handler.SendUtils;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.LoggerContext;
  
 /**
  * Created by panzhao on 2017/4/14.
@@ -56,8 +62,29 @@ public class AdminUtilsController {
     PilotReport pilotReport;
  
     @Autowired
+    private MailUtils mailUtils;
+
+    @Autowired
     private BasicData.BasicDataLoader basicDataLoader;
  
+    @Autowired
+    private SectionService sectionService;
+
+    @Autowired
+    private StationService stationService;
+
+    @Autowired
+    private SystemParamService systemParamService;
+
+    @Autowired
+    private SocketClientLoader socketClientLoader;
+
+    @Autowired
+    private GatewayHttpLoader gatewayHttpLoader;
+
+    @Autowired
+    private GatewayHttpUtils gatewayHttpUtils;
+
     /**
      * 出现重复班次的车辆
      *
@@ -218,9 +245,71 @@ public class AdminUtilsController {
  
     @RequestMapping("/reloadSystemParam")
     public String reloadSystemParam() {
+        try {
+            systemParamService.refresh();
+
+            return "success";
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return "error";
+    }
+
+    @RequestMapping("/applySystemParam")
+    public String applySystemParam() {
+        try {
+            socketClientLoader.afterPropertiesSet();
+            gatewayHttpLoader.afterPropertiesSet();
+            gatewayHttpUtils.afterPropertiesSet();
+            //rfidHttpLoader.afterPropertiesSet();
+            //ssoConfig.afterPropertiesSet();
+
+            return "success";
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return "error";
+    }
+
+    @RequestMapping("/reloadAndApplySystemParam")
+    public String reloadAndApplySystemParam() {
+        try {
+            systemParamService.refresh();
+
+            socketClientLoader.afterPropertiesSet();
+            gatewayHttpLoader.afterPropertiesSet();
+            gatewayHttpUtils.afterPropertiesSet();
+            //rfidHttpLoader.afterPropertiesSet();
+            //ssoConfig.afterPropertiesSet();
+
+            return "success";
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return "error";
+    }
+
+    @RequestMapping("/section/translateWgs2Bd")
+    public String translateWgs2Bd1() {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            //sectionService.translateWgs2Bd();
+            return "success";
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return "error";
+    }
+
+    @RequestMapping("/station/translateWgs2Bd")
+    public String translateWgs2Bd2() {
         Map<String, Object> result = new HashMap<>();
         try {
-            basicDataLoader.loadSystemParam();
+            //stationService.translateWgs2Bd();
             return "success";
         } catch (Exception e) {
             e.printStackTrace();
-package com.bsth.controller.sys;
-
-import java.util.Map;
-
-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;
-
-import com.bsth.controller.BaseController;
-import com.bsth.entity.sys.Role;
-import com.bsth.service.sys.RoleService;
-
-@RestController
-@RequestMapping("role")
-public class RoleController extends BaseController<Role, Integer>{
-	
-	
-	@Autowired
-	RoleService roleService;
-	
-	/**
-	 * 
-	 * @Title: settRoleModules 
-	 * @Description: TODO(为角色设置模块，全量覆盖) 
-	 * @param @param roleId 角色ID
-	 * @param @param mIds  模块ID字符串（1,2,3,4）
-	 * @throws
-	 */
-	@RequestMapping(value = "/settModules", method = RequestMethod.POST)
-	public Map<String, Object> settRoleModules(@RequestParam Integer roleId,@RequestParam String mIds){
-		return roleService.settRoleModules(roleId, mIds);
-	}
-	
-	/**
-	 * 
-	 * @Title: roleInfo 
-	 * @Description: TODO(角色信息) 
-	 * @param @param id 角色ID
-	 * @throws
-	 */
-	@RequestMapping(value = "/roleInfo")
-	public Map<String, Object> roleInfo(@RequestParam Integer id){
-		return roleService.roleInfo(id);
-	}
-}
+package com.bsth.controller.sys;
+
+import java.util.Map;
+
+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;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.sys.Role;
+import com.bsth.service.sys.RoleService;
+
+@RestController
+@RequestMapping("role")
+public class RoleController extends BaseController<Role, Integer>{
+	
+	
+	@Autowired
+	RoleService roleService;
+
+	/**
+	 * @param @param map
+	 * @throws
+	 * @Title: list
+	 * @Description: TODO(查询下级)
+	 */
+	@RequestMapping(value = "/findSubordinate", method = RequestMethod.GET)
+	public Map<String, Object> findSubordinate() {
+		return roleService.findSubordinate();
+	}
+
+	/**
+	 * @param @param map
+	 * @Description: TODO(添加角色)
+	 * @return
+	 */
+	@RequestMapping(value = "/add", method = RequestMethod.POST)
+	public Map<String, Object> add(Role role){
+		return roleService.add(role);
+	}
+
+	/**
+	 * 
+	 * @Title: settRoleModules 
+	 * @Description: TODO(为角色设置模块，全量覆盖) 
+	 * @param @param roleId 角色ID
+	 * @param @param mIds  模块ID字符串（1,2,3,4）
+	 * @throws
+	 */
+	@RequestMapping(value = "/settModules", method = RequestMethod.POST)
+	public Map<String, Object> settRoleModules(@RequestParam Integer roleId,@RequestParam String mIds){
+		return roleService.settRoleModules(roleId, mIds);
+	}
+	
+	/**
+	 * 
+	 * @Title: roleInfo 
+	 * @Description: TODO(角色信息) 
+	 * @param @param id 角色ID
+	 * @throws
+	 */
+	@RequestMapping(value = "/roleInfo")
+	public Map<String, Object> roleInfo(@RequestParam Integer id){
+		return roleService.roleInfo(id);
+	}
+
+	/**
+	 * 检查操作合法性 操作的是否是下级角色
+	 * @param operationRoleId 下级角色Id
+	 * @return
+	 */
+	@RequestMapping(value = "/checkOperationLegality")
+	public boolean checkOperationLegality(@RequestParam Integer operationRoleId){
+		return roleService.checkOperationLegality(operationRoleId);
+	}
+}
-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.logger.UserSignService;
-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;
-
-    @Autowired
-    UserSignService userLogInoutService;
-
-    @RequestMapping(value = "/login/jCryptionKey")
-    public Map<String, Object> jCryptionKey(HttpServletRequest request) {
-        //公匙返回页面
-        Map<String, Object> rs = new HashMap<>();
-        rs.put("publickey", RSAUtils.generateBase64PublicKey());
-        return rs;
-    }
-
-    //需要验证码的账号
-    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);
-
-            // 记录登录日志
-            userLogInoutService.userLogIn(user.getUserName(), session.getId(), new Date());
-        } 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 = "";
-        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();
-    }
-}
+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.Role;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
+import com.bsth.service.logger.UserSignService;
+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.joda.time.DateTime;
+import org.joda.time.Period;
+import org.joda.time.PeriodType;
+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;
+
+    @Autowired
+    UserSignService userLogInoutService;
+
+    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 (null == user) {
+                userOrPasswordInvalid(rs, userName);
+
+                return rs;
+            }
+
+            // 校验用户状态
+            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 (!matchStatus) {
+                userOrPasswordInvalid(rs, userName);
+
+                return rs;
+            }
+
+            // 检验密码有效期
+            Date lastPwdDate = user.getLastPwdDate();
+            if (lastPwdDate != null) {
+                if (user.getPwdExpiredDate().before(new Date())) {
+                    return put(rs, "msg", "密码已过期，不能登录，请联系管理员");
+                }
+
+                Integer validPeriod = user.getPwdValidPeriod();
+                if (validPeriod == null) {
+                    validPeriod = 30;
+                }
+                Period p = new Period(new DateTime(lastPwdDate), new DateTime(new Date()), PeriodType.days());
+                if (p.getDays() > validPeriod) {
+                    return put(rs, "msg", "天没有修改密码，不能登录，请联系管理员");
+                }
+            } else {
+                return put(rs, "msg", "从未更新过密码，不能登录，请联系管理员");
+            }
+
+            // 弱密码检查
+            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());
+            session.setAttribute(Constants.RESOURCE_AUTHORITYS, user.getLinks());
+
+            //获取公司权限数据
+            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() + "登录");
+
+            // 记录登录日志
+            userLogInoutService.userLogIn(user.getUserName(), session.getId(), new Date());
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("msg", "服务器出现异常，请联系管理员");
+        }
+        return rs;
+    }
+
+    private void userOrPasswordInvalid(Map<String, Object> rs, String userName) {
+        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分钟");
+        }
+    }
+
+    @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());
+            session.setAttribute(Constants.RESOURCE_AUTHORITYS, user.getLinks());
+
+            //获取公司权限数据
+            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 = "/validPWDExpired", method = RequestMethod.GET)
+    public String validPWDExpired() {
+        try {
+            SysUser sysUser = SecurityUtils.getCurrentUser();
+            this.sysUserService.validPWDExpired(sysUser.getUserName());
+            return "ok";
+        } catch (Exception exp) {
+            exp.printStackTrace();
+            return exp.getMessage();
+        }
+    }
+
+    @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, @RequestParam Integer pwdValidPeriod) {
+        return sysUserService.resetPassword(id, pwdValidPeriod);
+    }
+
+    /**
+     * 解除临时锁定
+     * @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;
+    }
+
+//    /**
+//     * 弱密码
+//     * @return
+//     */
+//    @RequestMapping(value = "/isRealName", method = RequestMethod.POST)
+//    public Map<String, Object> hasJobCode() {
+//        Map<String, Object> result = new HashMap<>();
+//        SysUser user = SecurityUtils.getCurrentUser();
+//        result.put("status", ResponseCode.SUCCESS);
+//        result.put("data", (StringUtils.isBlank(user.getJobCode()) || StringUtils.isBlank(user.getRealName())) ? 0 : 1);
+//
+//        return result;
+//    }
+//
+//    // 重置密码
+//    @RequestMapping(value = "/realName", method = RequestMethod.POST)
+//    public Map<String, Object> setJobCode(@RequestParam String jobCode, @RequestParam String realName) throws Exception {
+//        Map<String, Object> data = new HashMap<>(), result = new HashMap<>();
+//        result.put("status", ResponseCode.ERROR);
+//        result.put("data", "设置成功");
+//
+//        if (jobCode == null || realName == null) {
+//            result.put("data", "你跳过验证了是吧");
+//            return result;
+//        }
+//        data.put("account", jobCode);
+//        data.put("pageSize", 2);
+//        data.put("pageNum", 1);
+//        StringBuilder stringBuilder = HttpClientUtils.post("https://112.64.45.51/businessCenter/userInfo/queryUserList", mapper.writeValueAsString(data));
+//        if (stringBuilder == null) {
+//            result.put("data", "统一平台验证失败1");
+//            return result;
+//        } else {
+//            List<Map<String, Object>> maps = mapper.readValue(mapper.writeValueAsString(((Map) mapper.readValue(stringBuilder.toString(), Map.class).get("data")).get("list")), mapper.getTypeFactory().constructParametricType(List.class, Map.class));
+//            if (maps.size() == 0) {
+//                result.put("data", "统一平台验证失败2");
+//                return result;
+//            } else {
+//                boolean isAuth = false;
+//                for (Map<String, Object> map : maps) {
+//                    if (realName.equals(map.get("name"))) {
+//                        isAuth = true;
+//                        break;
+//                    }
+//                }
+//                if (!isAuth) {
+//                    result.put("data", "统一平台验证失败3");
+//                    return result;
+//                }
+//            }
+//        }
+//
+//        SysUser user = SecurityUtils.getCurrentUser();
+//        sysUserService.realName(jobCode, realName, user.getId());
+//        user.setJobCode(jobCode);
+//        user.setRealName(realName);
+//
+//        result.put("status", ResponseCode.SUCCESS);
+//        return result;
+//    }
+
+}
+package com.bsth.data;
+
+import com.bsth.common.SystemParamKeys;
+import com.bsth.service.SystemParamService;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Hill
+ */
+@Component
+public class SystemParamCache implements InitializingBean {
+
+    @Autowired
+    private SystemParamService systemParamService;
+
+    private static SystemParamService systemParamService1;
+
+    public static String getSpecialRoles() {
+        return systemParamService1.getValue(SystemParamKeys.SPECIAL_ROLES);
+    }
+
+    public static String getSpecialDays() {
+        return systemParamService1.getValue(SystemParamKeys.SPECIAL_DAYS);
+    }
+
+    public static String getUrlHttpGpsRealCache() {
+        return systemParamService1.getValue(SystemParamKeys.URL_HTTP_GPS_REAL_CACHE);
+    }
+
+    public static String getUrlHttpGpsReal() {
+        return systemParamService1.getValue(SystemParamKeys.URL_HTTP_GPS_REAL);
+    }
+
+    public static String getUrlHttpDirective() {
+        return systemParamService1.getValue(SystemParamKeys.URL_HTTP_DIRECTIVE);
+    }
+
+    public static String getUrlHttpRfid() {
+        return systemParamService1.getValue(SystemParamKeys.URL_HTTP_RFID);
+    }
+
+    public static String getUrlHttpReport(String param) {
+        return systemParamService1.getValue(String.format(SystemParamKeys.URL_HTTP_REPORT, param));
+    }
+
+    public static String getUrlHttpTicketing() {
+        return systemParamService1.getValue(SystemParamKeys.URL_HTTP_TICKETING);
+    }
+
+    public static String getUrlHttpDsmAck() {
+        return systemParamService1.getValue(SystemParamKeys.URL_HTTP_DSM_ACK);
+    }
+
+    public static String getUrlHttpCpAck() {
+        return systemParamService1.getValue(SystemParamKeys.URL_HTTP_CP_ACK);
+    }
+
+    public static String getMailAdmin() {
+        return systemParamService1.getValue(SystemParamKeys.MAIL_ADMIN);
+    }
+
+    public static String getMailWaybill() {
+        return systemParamService1.getValue(SystemParamKeys.MAIL_WAYBILL);
+    }
+
+    public static boolean getEnabledFirstLastGeneration() {
+        return Boolean.parseBoolean(systemParamService1.getValue(SystemParamKeys.ENABLED_FIRST_LAST_GENERATION));
+    }
+
+    public static boolean getEnabledFilterSqlInjection() {
+        return Boolean.parseBoolean(systemParamService1.getValue(SystemParamKeys.ENABLED_FILTER_SQL_INJECTION));
+    }
+
+    public static boolean getEnabledSso() {
+        return Boolean.parseBoolean(systemParamService1.getValue(SystemParamKeys.ENABLED_SSO));
+    }
+
+    public static String getSsoSystemCode() {
+        return systemParamService1.getValue(SystemParamKeys.SSO_SYSTEM_CODE);
+    }
+
+    public static String getUrlHttpSsoLogin() {
+        return systemParamService1.getValue(SystemParamKeys.URL_HTTP_SSO_LOGIN);
+    }
+
+    public static String getUrlHttpSsoLogout() {
+        return systemParamService1.getValue(SystemParamKeys.URL_HTTP_SSO_LOGOUT);
+    }
+
+    public static String getUrlHttpSsoAuth() {
+        return systemParamService1.getValue(SystemParamKeys.URL_HTTP_SSO_AUTH);
+    }
+
+    public static String getUrlHttpMaintenance() {
+        return systemParamService1.getValue(SystemParamKeys.URL_HTTP_MAINTENANCE);
+    }
+
+    public static boolean getEnabledWhiteIp() {
+        return Boolean.parseBoolean(systemParamService1.getValue(SystemParamKeys.ENABLED_WHITE_IP));
+    }
+
+    public static boolean getEnableFilterAuthority() {
+        return Boolean.parseBoolean(systemParamService1.getValue(SystemParamKeys.ENABLED_FILTER_AUTHORITY));
+    }
+
+    public static String getUrlHttpDvr() {
+        return systemParamService1.getValue(SystemParamKeys.URL_HTTP_DVR);
+    }
+
+    public static String getUrlHttpDvrPwd() {
+        return systemParamService1.getValue(SystemParamKeys.URL_HTTP_DVR_PWD);
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        systemParamService1 = systemParamService;
+        systemParamService1.refresh();
+    }
+}
 \ No newline at end of file
+package com.bsth.data;
+
+import com.bsth.Application;
+import com.bsth.XDApplication;
+import com.bsth.entity.WhiteIp;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+@Component
+public class WhiteIpCache implements InitializingBean {
+
+    private final static Logger log = LoggerFactory.getLogger(WhiteIpCache.class);
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    private static List<WhiteIp> whiteIps;
+
+    public static List<WhiteIp> getWhiteIps() {
+        return whiteIps;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        Application.mainServices.scheduleWithFixedDelay(new WhiteIpDataLoader(), 0, 1, TimeUnit.MINUTES);
+    }
+
+    class WhiteIpDataLoader extends Thread {
+
+        @Override
+        public void run() {
+            if (SystemParamCache.getEnabledWhiteIp()) {
+                loadData();
+            }
+        }
+
+        /**
+         * @Title: loadAllData
+         * @Description: TODO(加载所有数据)
+         */
+        public int loadData() {
+            try {
+                log.info("开始加载IP白名单数据..，");
+                loadWhiteIp();
+                log.info("加载IP白名单数据成功！，");
+            } catch (Exception e) {
+                log.error("加载IP白名单数据时出现异常，", e);
+            }
+            return 0;
+        }
+
+        /**
+         * 加载IP白名单
+         */
+        public void loadWhiteIp() {
+            List<WhiteIp> result = jdbcTemplate.query("select * from control_interface.bsth_c_white_ip where valid_date > now()", BeanPropertyRowMapper.newInstance(WhiteIp.class));
+            whiteIps = result;
+        }
+    }
+}
-package com.bsth.data.directive;
-
-import com.alibaba.fastjson.JSONObject;
-import com.bsth.util.ConfigUtil;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author PanZhao
- * @ClassName: GatewayHttpUtils
- * @Description: TODO(和网关HTTP通讯工具类)
- * @date 2016年8月14日 下午9:50:46
- */
-public class GatewayHttpUtils {
-    static Logger logger = LoggerFactory.getLogger(GatewayHttpUtils.class);
-
-    static String url;
-    static CloseableHttpClient httpClient = null;
-    static HttpPost post;
-    static RequestConfig requestConfig;
-    static CloseableHttpResponse response;
-
-    static {
-        url = ConfigUtil.get("http.send.directive");
-        httpClient = HttpClients.createDefault();
-        post = new HttpPost(url);
-        requestConfig = RequestConfig.custom()
-                .setConnectTimeout(3000).setConnectionRequestTimeout(2000)
-                .setSocketTimeout(3000).build();
-        post.setConfig(requestConfig);
-    }
-
-    public static int postJson(String jsonStr) {
-        logger.info("send : " + jsonStr);
-
-        int code = -1;
-        try {
-            post.setEntity(new StringEntity(jsonStr, "utf-8"));
-
-            response = httpClient.execute(post);
-
-            int statusCode = response.getStatusLine().getStatusCode();
-            if(statusCode != 200){
-                logger.error("http client status code: " + statusCode);
-            }
-
-            JSONObject json = JSONObject.parseObject(EntityUtils.toString(response.getEntity()));
-            if (null != json && json.getInteger("errCode") == 0)
-                code = 0;
-            else
-                logger.error("和网关http通讯失败，rs: " + json);
-
-            if (null != response)
-                response.close();
-        } catch (Exception e) {
-            logger.error("", e);
-        }
-        return code;
-    }
-}
+package com.bsth.data.directive;
+
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.SystemParamCache;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author PanZhao
+ * @ClassName: GatewayHttpUtils
+ * @Description: TODO(和网关HTTP通讯工具类)
+ * @date 2016年8月14日 下午9:50:46
+ */
+@Component
+public class GatewayHttpUtils implements InitializingBean {
+    static Logger logger = LoggerFactory.getLogger(GatewayHttpUtils.class);
+
+    static String url;
+    static CloseableHttpClient httpClient = null;
+    static HttpPost post;
+    static RequestConfig requestConfig;
+    static CloseableHttpResponse response;
+
+    public static int postJson(String jsonStr) {
+        logger.info("send : " + jsonStr);
+
+        int code = -1;
+        try {
+            post.setEntity(new StringEntity(jsonStr, "utf-8"));
+
+            response = httpClient.execute(post);
+
+            int statusCode = response.getStatusLine().getStatusCode();
+            if(statusCode != 200){
+                logger.error("http client status code: " + statusCode);
+            }
+
+            JSONObject json = JSONObject.parseObject(EntityUtils.toString(response.getEntity()));
+            if (null != json && json.getInteger("errCode") == 0)
+                code = 0;
+            else
+                logger.error("和网关http通讯失败，rs: " + json);
+
+            if (null != response)
+                response.close();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+        return code;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        url = SystemParamCache.getUrlHttpDirective();
+        httpClient = HttpClients.createDefault();
+        post = new HttpPost(url);
+        requestConfig = RequestConfig.custom()
+                .setConnectTimeout(3000).setConnectionRequestTimeout(2000)
+                .setSocketTimeout(3000).build();
+        post.setConfig(requestConfig);
+    }
+}
@@ -2,10 +2,10 @@ package com.bsth.data.gpsdata_v2.load;
  
 import com.alibaba.fastjson.JSON;
 import com.bsth.data.BasicData;
+import com.bsth.data.SystemParamCache;
 import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.gpsdata_v2.utils.GpsDataUtils;
-import com.bsth.util.ConfigUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.config.RequestConfig;
@@ -16,6 +16,7 @@ import org.apache.http.impl.client.HttpClients;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
@@ -30,7 +31,7 @@ import java.util.List;
  * Created by panzhao on 2017/11/15.
  */
 @Component
-public class GatewayHttpLoader implements ApplicationContextAware{
+public class GatewayHttpLoader implements ApplicationContextAware, InitializingBean {
  
     static Logger logger = LoggerFactory.getLogger(GatewayHttpLoader.class);
  
@@ -45,17 +46,6 @@ public class GatewayHttpLoader implements ApplicationContextAware{
  
     static GpsRealData gpsRealData;
  
-    static{
-        url = ConfigUtil.get("http.gps.real.url");
-        list = new ArrayList<>();
-        httpClient = HttpClients.createDefault();
-        get = new HttpGet(url);
-        requestConfig = RequestConfig.custom()
-                .setConnectTimeout(2500).setConnectionRequestTimeout(2000)
-                .setSocketTimeout(2500).build();
-        get.setConfig(requestConfig);
-    }
-
     public static List<GpsEntity> load(){
         try{
             if(list.size() > 0)
@@ -117,4 +107,16 @@ public class GatewayHttpLoader implements ApplicationContextAware{
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
         gpsRealData = applicationContext.getBean(GpsRealData.class);
     }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        url = SystemParamCache.getUrlHttpGpsReal();
+        list = new ArrayList<>();
+        httpClient = HttpClients.createDefault();
+        get = new HttpGet(url);
+        requestConfig = RequestConfig.custom()
+                .setConnectTimeout(2500).setConnectionRequestTimeout(2000)
+                .setSocketTimeout(2500).build();
+        get.setConfig(requestConfig);
+    }
 }
-package com.bsth.data.gpsdata_v2.load;
-
-import com.alibaba.fastjson.JSON;
-import com.bsth.data.BasicData;
-import com.bsth.data.gpsdata_v2.entity.GpsEntity;
-import com.bsth.data.gpsdata_v2.utils.GpsDataUtils;
-import com.bsth.util.ConfigUtil;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 从专用的socket client 加载数据
- * Created by panzhao on 2017/11/15.
- */
-public class SocketClientLoader {
-
-    static Logger logger = LoggerFactory.getLogger(SocketClientLoader.class);
-
-    static String url;
-    static List<GpsEntity> list;
-    static CloseableHttpClient httpClient = null;
-    static HttpGet get;
-    static RequestConfig requestConfig;
-    static CloseableHttpResponse response;
-    static HttpEntity entity;
-    static BufferedReader br;
-
-    static {
-        url = ConfigUtil.get("http.gps.real.cache.url");
-        list = new ArrayList<>();
-        httpClient = HttpClients.createDefault();
-        get = new HttpGet(url);
-        requestConfig = RequestConfig.custom()
-                .setConnectTimeout(2500).setConnectionRequestTimeout(2000)
-                .setSocketTimeout(2500).build();
-        get.setConfig(requestConfig);
-    }
-
-    public static List<GpsEntity> load(){
-        try {
-            if(list.size() > 0)
-                list.clear();
-            logger.info("load start...");
-            response = httpClient.execute(get);
-            entity = response.getEntity();
-            if(null == entity)
-                return list;
-
-            br = new BufferedReader(new InputStreamReader(entity.getContent()));
-            StringBuilder sb = new StringBuilder();
-            String str;
-            while ((str = br.readLine()) != null)
-                sb.append(str);
-
-            list = JSON.parseArray(sb.toString(), GpsEntity.class);
-
-            logger.info("load end ! size: " + list.size());
-            //过滤掉无效的点位
-            list = GpsDataUtils.clearInvalid(list);
-
-            for (GpsEntity gps : list) {
-                gps.setNbbm(BasicData.deviceId2NbbmMap.get(gps.getDeviceId()));
-            }
-
-            if (null != response)
-                response.close();
-        } catch (Exception e) {
-            logger.error("", e);
-        }
-
-        return list;
-    }
-}
+package com.bsth.data.gpsdata_v2.load;
+
+import com.alibaba.fastjson.JSON;
+import com.bsth.data.BasicData;
+import com.bsth.data.SystemParamCache;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.utils.GpsDataUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.stereotype.Component;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 从专用的socket client 加载数据
+ * Created by panzhao on 2017/11/15.
+ */
+@Component
+public class SocketClientLoader implements InitializingBean {
+
+    static Logger logger = LoggerFactory.getLogger(SocketClientLoader.class);
+
+    static String url;
+    static List<GpsEntity> list;
+    static CloseableHttpClient httpClient = null;
+    static HttpGet get;
+    static RequestConfig requestConfig;
+    static CloseableHttpResponse response;
+    static HttpEntity entity;
+    static BufferedReader br;
+
+    public static List<GpsEntity> load(){
+        try {
+            if(list.size() > 0)
+                list.clear();
+            logger.info("load start...");
+            response = httpClient.execute(get);
+            entity = response.getEntity();
+            if(null == entity)
+                return list;
+
+            br = new BufferedReader(new InputStreamReader(entity.getContent()));
+            StringBuilder sb = new StringBuilder();
+            String str;
+            while ((str = br.readLine()) != null)
+                sb.append(str);
+
+            list = JSON.parseArray(sb.toString(), GpsEntity.class);
+
+            logger.info("load end ! size: " + list.size());
+            //过滤掉无效的点位
+            list = GpsDataUtils.clearInvalid(list);
+
+            for (GpsEntity gps : list) {
+                gps.setNbbm(BasicData.deviceId2NbbmMap.get(gps.getDeviceId()));
+            }
+
+            if (null != response)
+                response.close();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+
+        return list;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        url = SystemParamCache.getUrlHttpGpsRealCache();
+        list = new ArrayList<>();
+        httpClient = HttpClients.createDefault();
+        get = new HttpGet(url);
+        requestConfig = RequestConfig.custom()
+                .setConnectTimeout(2500).setConnectionRequestTimeout(2000)
+                .setSocketTimeout(2500).build();
+        get.setConfig(requestConfig);
+    }
+}
-package com.bsth.entity.sys;
-
-import java.util.Date;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-@Entity
-@Table(name = "bsth_c_sys_role")
-public class Role {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Integer id;
-	
-	private String codeName;
-
-	private String roleName;
-
-	private String descriptions;
-	
-	private boolean isSuperAdmin;
-
-	private boolean enable;
-	
-	@JsonIgnore
-	@ManyToMany(fetch = FetchType.LAZY, mappedBy = "roles")
-	private Set<SysUser> users = new LinkedHashSet<>();
-	
-	@JsonIgnore
-	@ManyToMany
-	private Set<Module> modules = new LinkedHashSet<>();
-	
-	@JsonIgnore
-	@ManyToMany(mappedBy = "roles")
-	private Set<Resource> resources = new LinkedHashSet<>();
-	
-	@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;
-	
-	private int pic;
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public String getRoleName() {
-		return roleName;
-	}
-
-	public String getDescriptions() {
-		return descriptions;
-	}
-
-	public void setDescriptions(String descriptions) {
-		this.descriptions = descriptions;
-	}
-
-	public void setRoleName(String roleName) {
-		this.roleName = roleName;
-	}
-
-	public boolean isEnable() {
-		return enable;
-	}
-
-	public void setEnable(boolean enable) {
-		this.enable = enable;
-	}
-
-	public Set<SysUser> getUsers() {
-		return users;
-	}
-
-	public void setUsers(Set<SysUser> users) {
-		this.users = users;
-	}
-
-	public boolean isSuperAdmin() {
-		return isSuperAdmin;
-	}
-
-	public void setSuperAdmin(boolean isSuperAdmin) {
-		this.isSuperAdmin = isSuperAdmin;
-	}
-
-	public Set<Module> getModules() {
-		return modules;
-	}
-
-	public void setModules(Set<Module> modules) {
-		this.modules = modules;
-	}
-
-	public Set<Resource> getResources() {
-		return resources;
-	}
-
-	public void setResources(Set<Resource> resources) {
-		this.resources = resources;
-	}
-
-	public Date getCreateDate() {
-		return createDate;
-	}
-
-	public void setCreateDate(Date createDate) {
-		this.createDate = createDate;
-	}
-
-	public Date getUpdateDate() {
-		return updateDate;
-	}
-
-	public void setUpdateDate(Date updateDate) {
-		this.updateDate = updateDate;
-	}
-
-	public String getCodeName() {
-		return codeName;
-	}
-
-	public void setCodeName(String codeName) {
-		this.codeName = codeName;
-	}
-
-	public int getPic() {
-		return pic;
-	}
-
-	public void setPic(int pic) {
-		this.pic = pic;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		return this.id.equals(((Role)obj).getId());
-	}
-
-	@Override
-	public int hashCode() {
-		return this.toString().hashCode();
-	}
-
-	@Override
-	public String toString() {
-		return this.id + "" + this.getCodeName();
-	}
-}
+package com.bsth.entity.sys;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.hibernate.annotations.Formula;
+
+@Entity
+@Table(name = "bsth_c_sys_role")
+public class Role implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+	
+	private String codeName;
+
+	private String roleName;
+
+	private String descriptions;
+	
+	private boolean isSuperAdmin;
+
+	private boolean enable;
+	
+	@JsonIgnore
+	@ManyToMany(fetch = FetchType.LAZY, mappedBy = "roles")
+	private Set<SysUser> users = new LinkedHashSet<>();
+	
+	@JsonIgnore
+	@ManyToMany
+	private Set<Module> modules = new LinkedHashSet<>();
+	
+	@JsonIgnore
+	@ManyToMany(mappedBy = "roles")
+	private Set<Resource> resources = new LinkedHashSet<>();
+	
+	@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;
+
+	/**
+	 * 角色权限
+	 *
+	 * 角色树结构 本级只能管理下级角色，不能查看同级和上级的任何数据：这里主要为了规范管理 （管理员）层级的用户
+	 *
+	 * 只能看其他角色upCode 等于 本角色roleCode  level字段等级比自己小的 其他角色  严格的树形结构，只能看自己分支下级节点
+	 *
+	 */
+	private int roleCode;
+
+	private int upCode;
+
+    private int level;
+
+    /** 组合自己和父节点编码 */
+    @Formula(" concat(up_code, '_', role_code) ")
+    private String groupCode;
+
+    @Formula(" concat(level, '_',role_code) ")
+    private String levelCode;
+
+	private int pic;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getRoleName() {
+		return roleName;
+	}
+
+	public String getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(String descriptions) {
+		this.descriptions = descriptions;
+	}
+
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+
+	public boolean isEnable() {
+		return enable;
+	}
+
+	public void setEnable(boolean enable) {
+		this.enable = enable;
+	}
+
+	public Set<SysUser> getUsers() {
+		return users;
+	}
+
+	public void setUsers(Set<SysUser> users) {
+		this.users = users;
+	}
+
+	public boolean isSuperAdmin() {
+		return isSuperAdmin;
+	}
+
+	public void setSuperAdmin(boolean isSuperAdmin) {
+		this.isSuperAdmin = isSuperAdmin;
+	}
+
+	public Set<Module> getModules() {
+		return modules;
+	}
+
+	public void setModules(Set<Module> modules) {
+		this.modules = modules;
+	}
+
+	public Set<Resource> getResources() {
+		return resources;
+	}
+
+	public void setResources(Set<Resource> resources) {
+		this.resources = resources;
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
+	public Date getUpdateDate() {
+		return updateDate;
+	}
+
+	public void setUpdateDate(Date updateDate) {
+		this.updateDate = updateDate;
+	}
+
+	public String getCodeName() {
+		return codeName;
+	}
+
+	public void setCodeName(String codeName) {
+		this.codeName = codeName;
+	}
+
+	public int getRoleCode() {
+		return roleCode;
+	}
+
+	public void setRoleCode(int roleCode) {
+		this.roleCode = roleCode;
+	}
+
+	public int getUpCode() {
+		return upCode;
+	}
+
+	public void setUpCode(int upCode) {
+		this.upCode = upCode;
+	}
+
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
+
+    public String getGroupCode() {
+        return groupCode;
+    }
+
+    public void setGroupCode(String groupCode) {
+        this.groupCode = groupCode;
+    }
+
+
+    public String getLevelCode() {
+        return levelCode;
+    }
+
+    public void setLevelCode(String levelCode) {
+        this.levelCode = levelCode;
+    }
+
+	public int getPic() {
+		return pic;
+	}
+
+	public void setPic(int pic) {
+		this.pic = pic;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		return this.id.equals(((Role)obj).getId());
+	}
+
+	@Override
+	public int hashCode() {
+		return this.toString().hashCode();
+	}
+
+	@Override
+	public String toString() {
+		return this.id + "" + this.getCodeName();
+	}
+}
-package com.bsth.entity.sys;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-import javax.persistence.*;
-import java.util.Date;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-@Entity
-@Table(name = "bsth_c_sys_user")
-@JsonIgnoreProperties(ignoreUnknown = true)
-@NamedEntityGraphs({
-		@NamedEntityGraph(name = "sysUser_role", attributeNodes = {
-				@NamedAttributeNode("roles")
-		})
-})
-public class SysUser {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Integer id;
-
-	private String userName;
-
-	private String name;
-	
-	private String password;
-
-	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-	private Date createDate;
-	
-	@Column(name = "last_loginDate", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-	private Date lastLoginDate;
-
-	private String agencies;
-
-	private boolean enabled;
-	
-	@ManyToMany(fetch = FetchType.EAGER)
-	private Set<Role> roles = new LinkedHashSet<>();
-	
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Date getCreateDate() {
-		return createDate;
-	}
-
-	public void setCreateDate(Date createDate) {
-		this.createDate = createDate;
-	}
-
-	public Date getLastLoginDate() {
-		return lastLoginDate;
-	}
-
-	public void setLastLoginDate(Date lastLoginDate) {
-		this.lastLoginDate = lastLoginDate;
-	}
-
-	public String getAgencies() {
-		return agencies;
-	}
-
-	public void setAgencies(String agencies) {
-		this.agencies = agencies;
-	}
-
-	public boolean isEnabled() {
-		return enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	public Set<Role> getRoles() {
-		return roles;
-	}
-
-	public void setRoles(Set<Role> roles) {
-		this.roles = roles;
-	}
-}
+package com.bsth.entity.sys;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.util.StringUtils;
+import org.joda.time.DateTime;
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+@Entity
+@Table(name = "bsth_c_sys_user")
+@JsonIgnoreProperties(ignoreUnknown = true)
+@NamedEntityGraphs({
+		@NamedEntityGraph(name = "sysUser_role", attributeNodes = {
+				@NamedAttributeNode("roles")
+		})
+})
+public class SysUser implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+
+	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;
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private Date lastLoginDate;
+
+    /** 最近密码更新时间 */
+	@Column(updatable = false, name = "last_pwd_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date lastPwdDate;
+    /** 密码有效期 */
+    private Integer pwdValidPeriod = 30;
+
+	private String agencies;
+
+	private boolean enabled;
+	
+	@ManyToMany(fetch = FetchType.EAGER)
+	private Set<Role> roles = new LinkedHashSet<>();
+
+	private String jobCode;
+
+	private String realName;
+
+	/**
+	 * 密码过期时间
+	 */
+	@Transient
+	private Date pwdExpiredDate;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getUserName() {
+		return userName;
+	}
+
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
+	public Date getUpdateDate() {
+		return updateDate;
+	}
+
+	public void setUpdateDate(Date updateDate) {
+		this.updateDate = updateDate;
+	}
+
+	public Date getLastLoginDate() {
+		return lastLoginDate;
+	}
+
+	public void setLastLoginDate(Date lastLoginDate) {
+		this.lastLoginDate = lastLoginDate;
+	}
+
+	public String getAgencies() {
+		return agencies;
+	}
+
+	public void setAgencies(String agencies) {
+		this.agencies = agencies;
+	}
+
+	public boolean isEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	public Set<Role> getRoles() {
+		return roles;
+	}
+
+	public void setRoles(Set<Role> roles) {
+		this.roles = roles;
+	}
+
+	public String getJobCode() {
+		return jobCode;
+	}
+
+	public void setJobCode(String jobCode) {
+		this.jobCode = jobCode;
+	}
+
+	public String getRealName() {
+		return realName;
+	}
+
+	public void setRealName(String realName) {
+		this.realName = realName;
+	}
+
+	@JsonIgnore
+	public Set<String> getLinks() {
+		Set<String> links = new HashSet<>();
+		if (links.size() == 0) {
+			for (Role role : roles) {
+				for (Module module : role.getModules()) {
+					String symbol = module.getMappSymbol();
+					if (!StringUtils.isEmpty(symbol)) {
+						String[] symbols = symbol.split(";");
+						for (String temp : symbols) {
+							if (!StringUtils.isEmpty(temp)) {
+								links.add(temp);
+							}
+						}
+					}
+				}
+			}
+		}
+
+		return links;
+	}
+
+    public Date getLastPwdDate() {
+        return lastPwdDate;
+    }
+
+    public void setLastPwdDate(Date lastPwdDate) {
+        this.lastPwdDate = lastPwdDate;
+    }
+
+    public Integer getPwdValidPeriod() {
+        return pwdValidPeriod;
+    }
+
+    public void setPwdValidPeriod(Integer pwdValidPeriod) {
+        this.pwdValidPeriod = pwdValidPeriod;
+    }
+
+	public Date getPwdExpiredDate() {
+		DateTime dateTime = new DateTime(getLastPwdDate());
+		if (pwdValidPeriod != null) {
+			dateTime = dateTime.plusDays(pwdValidPeriod);
+		}
+
+		return dateTime.toDate();
+	}
+
+	public void setPwdExpiredDate(Date pwdExpiredDate) {
+		this.pwdExpiredDate = pwdExpiredDate;
+	}
+}
+package com.bsth.filter;
+
+import com.bsth.common.Constants;
+import com.bsth.common.ResponseCode;
+import com.bsth.data.SystemParamCache;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * 权限过滤器
+ * @author Hill
+ */
+public class AuthorityFilter extends BaseFilter {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    private ObjectMapper mapper = new ObjectMapper();
+
+    private final String rootUri = "/";
+
+    private final String scheduleReferer = "/real_control/v2";
+
+    private PathMatcher matcher = new AntPathMatcher();
+
+    private String[] pubUrls = new String[]{ "/pages/home.html", "/error", "/dictionary/all", "/user/validPWDExpired", "/user/isWeakCipher", "/user/isRealName", "/user/currentUser", "/user/companyData", "/user/changePWD", "/pages/permission/user/changePWD.html", "/module/findByCurrentUser", "/cars_sc/all", "/ee/all_py", "/eci/validate_get_destroy_info", "/business/all", "/personnel/all_py", "/companyAuthority/all", "/line/all", "/basic/refresh_person_data", "/downloadFile/download", "/report/lineList", "/adminUtils/**", "/pages/scheduleApp/module/common/**", "/e10adc3949ba59abbe56e057f20f883e.html", "/8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92.html"};
+
+    @Override
+    public void doFilter(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException {
+        if (!SystemParamCache.getEnableFilterAuthority()) {
+            chain.doFilter(request, response);
+            return;
+        }
+
+        String uri = request.getRequestURI(), referer = request.getHeader("Referer");
+        Set<String> links = (Set<String>) request.getSession().getAttribute(Constants.RESOURCE_AUTHORITYS);
+        if (rootUri.equals(uri) || (referer != null && referer.indexOf(scheduleReferer) > 0) || isPubURL(uri)) {
+            chain.doFilter(request, response);
+            return;
+        }
+        if (links != null) {
+            boolean matched = false;
+            for (String link : links) {
+                if (matcher.match(link, uri)) {
+                    matched = true;
+                    break;
+                }
+            }
+            if (!matched) {
+                Map<String, Object> result = new HashMap<>();
+                result.put("status", ResponseCode.ERROR);
+                result.put("msg", "未授权的访问");
+                response.setContentType("text/html;charset=utf-8");
+                response.getWriter().write(mapper.writeValueAsString(result));
+                return;
+            }
+        }
+
+        chain.doFilter(request, response);
+    }
+
+    protected boolean isPubURL(String uri) {
+        for (String pubUrl : pubUrls) {
+            if (matcher.match(pubUrl, uri)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
 \ No newline at end of file
-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.XIANDIAO_LOGIN ,Constants.IPAD_IMG_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.XIANDIAO_LOGIN ,Constants.IPAD_IMG_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;
+		httpResponse.setHeader("Content-Security-Policy", "script-src 'unsafe-inline' 'unsafe-eval' http: https:; worker-src blob:;");
+
+		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.Setting;
-import com.bsth.data.BasicData;
+import com.bsth.data.SystemParamCache;
+import com.bsth.data.WhiteIpCache;
 import com.bsth.entity.WhiteIp;
 import com.bsth.util.IpUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
  
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
@@ -21,17 +20,7 @@ import java.util.List;
 //@Component
 public class WhiteIpFilter implements Filter {
  
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    private Setting setting;
-
-    public Setting getSetting() {
-        return setting;
-    }
-
-    public void setSetting(Setting setting) {
-        this.setting = setting;
-    }
+	Logger logger = LoggerFactory.getLogger(this.getClass());
  
     @Override
     public void init(FilterConfig filterConfig) throws ServletException {
@@ -39,29 +28,34 @@ public class WhiteIpFilter implements Filter {
     }
  
     @Override
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
-        HttpServletRequest req = (HttpServletRequest)request;
-        HttpServletResponse res = (HttpServletResponse)response;
+	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
  
-        String ip = IpUtils.getIpAddr(req);
-        boolean isMatch = false;
-        List<WhiteIp> whiteIps = BasicData.whiteIpList;
-        if (whiteIps != null) {
-            for (WhiteIp whiteIp : whiteIps) {
-                if (ip.equals(whiteIp.getIp())) {
-                    isMatch = true;
-                    break;
-                }
-            }
-        }
-        if (isMatch || !setting.isWhiteipEnabled()) {
-            chain.doFilter(request, response);
-        } else {
-            logger.info(ip + "未在白名单中，不予访问");
-            res.setStatus(404);
-            return;
-        }
-    }
+		if (!SystemParamCache.getEnabledWhiteIp()) {
+			chain.doFilter(request, response);
+			return;
+		}
+
+		HttpServletRequest req = (HttpServletRequest)request;
+		HttpServletResponse res = (HttpServletResponse)response;
+
+		String ip = IpUtils.getIpAddr(req);
+		boolean isMatch = false;
+		List<WhiteIp> whiteIps = WhiteIpCache.getWhiteIps();
+		if (whiteIps != null) {
+			for (WhiteIp whiteIp : whiteIps) {
+				if (ip.equals(whiteIp.getIp())) {
+					isMatch = true;
+					break;
+				}
+			}
+		}
+		if (isMatch) {
+			chain.doFilter(request, response);
+		} else {
+            logger.info("{}未在白名单中，不予访问", ip);
+			res.setStatus(404);
+		}
+	}
  
     @Override
     public void destroy() {
-package com.bsth.repository.sys;
-
-
-import javax.transaction.Transactional;
-
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-import com.bsth.entity.sys.Role;
-import com.bsth.repository.BaseRepository;
-
-@Repository
-public interface RoleRepository extends BaseRepository<Role, Integer>{
-
-	/**
-	 * @Title: update 
-	 * @Description: TODO(简洁版更新（不需要级联的）) 
-	 */
-	@Modifying
-	@Transactional
-	@Query("update Role r set r.codeName=?1, r.roleName=?2, r.enable=?3, r.descriptions=?4 where r.id=?5")
-	void update(String codeName, String roleName, boolean enable, String descriptions, Integer id);
-}
+package com.bsth.repository.sys;
+
+
+import javax.transaction.Transactional;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import com.bsth.entity.sys.Role;
+import com.bsth.repository.BaseRepository;
+
+import java.util.List;
+
+@Repository
+public interface RoleRepository extends BaseRepository<Role, Integer>{
+
+	// 查询最大ID
+	@Query(value = "SELECT IFNULL(num,0) as maxId from (SELECT MAX(id) as num FROM bsth_c_sys_role) k"
+			, nativeQuery=true)
+	public int roleMaxId();
+
+	/**
+	 * @Title: update 
+	 * @Description: TODO(简洁版更新（不需要级联的）) 
+	 */
+	@Modifying
+	@Transactional
+	@Query("update Role r set r.codeName=?1, r.roleName=?2, r.enable=?3, r.descriptions=?4 where r.id=?5")
+	void update(String codeName, String roleName, boolean enable, String descriptions, Integer id);
+
+	@Query(value = "select * from role where id in(?1)",nativeQuery = true)
+	List<Role> findAllById(String ids);
+
+//	@Query(value = "select r from Role r where  < ?1")
+//	List<Role> findSubordinate(Integer pic);
+}
-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, last_pwd_date = now() 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);
+
+	@Modifying
+	@Query(value="update bsth_c_sys_user set job_code = ?1, real_name = ?2 where id = ?3",nativeQuery=true)
+	void realName(String jobCode, String realName, int id);
+}
 package com.bsth.security;
  
-import com.bsth.common.Setting;
+import com.bsth.common.Constants;
+import com.bsth.filter.AccessLogFilter;
+import com.bsth.filter.AuthorityFilter;
 import com.bsth.filter.WhiteIpFilter;
+import com.bsth.security.filter.LoginInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.embedded.ServletListenerRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -20,9 +22,6 @@ import org.springframework.security.web.firewall.DefaultHttpFirewall;
 import org.springframework.security.web.firewall.HttpFirewall;
 import org.springframework.security.web.session.HttpSessionEventPublisher;
  
-import com.bsth.common.Constants;
-import com.bsth.security.filter.LoginInterceptor;
-
 @Configuration
 @EnableWebSecurity
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
@@ -36,15 +35,12 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     @Autowired
     SecurityMetadataSourceService securityMetadataSourceService;
  
-    @Autowired
-    private Setting setting;
-
     @Override
     public void configure(WebSecurity web) throws Exception {
         // 白名单
-        web.ignoring().antMatchers(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);
+        web.ignoring().antMatchers(Constants.LOGIN_PAGE, Constants.LOGIN, Constants.ORIGINAL_LOGIN_PAGE, Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.CAPTCHA,
+                Constants.SERVICE_INTERFACE, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES,
+                Constants.UP_RFID_URL, Constants.STATION_AND_SECTION_COUNT, Constants.FILE_AUTH);
     }
  
     @Override
@@ -75,11 +71,16 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .expiredUrl(Constants.LOGIN_PAGE + "?error=true")
                 .maxSessionsPreventsLogin(false)
                 .sessionRegistry(sessionRegistry());
+        //edge游览器地图和轨迹播放不行的问题
+//        http.headers().contentSecurityPolicy(
+//                "script-src 'unsafe-inline' 'unsafe-eval' http: https:; worker-src blob:;"
+//        );
  
         WhiteIpFilter whiteIpFilter = new WhiteIpFilter();
-        whiteIpFilter.setSetting(setting);
         http.addFilterBefore(whiteIpFilter, FilterSecurityInterceptor.class);
         http.addFilterBefore(new LoginInterceptor(), FilterSecurityInterceptor.class);
+        http.addFilterBefore(new AccessLogFilter(), FilterSecurityInterceptor.class);
+        http.addFilterBefore(new AuthorityFilter(), FilterSecurityInterceptor.class);
         http.addFilter(filterSecurityInterceptor());
     }
  
@@ -6,4 +6,8 @@ import com.bsth.entity.SystemParam;
  * @author Hill
  */
 public interface SystemParamService extends BaseService<SystemParam, Integer> {
+
+    void refresh();
+
+    String getValue(String key);
 }
 package com.bsth.service.impl;
  
 import com.bsth.entity.SystemParam;
+import com.bsth.repository.SystemParamRepository;
 import com.bsth.service.SystemParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
  
 /**
  * @author Hill
  */
+@Service
+@EnableScheduling
 public class SystemParamServiceImpl extends BaseServiceImpl<SystemParam, Integer> implements SystemParamService {
+
+    @Autowired
+    private SystemParamRepository systemParamRepository;
+
+    private Map<String, String> pairs = new HashMap<>();
+
+    @Scheduled(cron = "0 0/30 * * * ?")
+    public void refresh() {
+        for (SystemParam sp : systemParamRepository.findAll()) {
+            pairs.put(sp.getKey(), sp.getValue());
+        }
+    }
+
+    public String getValue(String key) {
+        return pairs.get(key);
+    }
 }
-package com.bsth.service.sys;
-
-import java.util.Map;
-
-import com.bsth.entity.sys.Role;
-import com.bsth.service.BaseService;
-
-public interface RoleService extends BaseService<Role, Integer>{
-
-	Map<String, Object> settRoleModules(Integer roleId, String mIds);
-	
-	Map<String, Object> roleInfo(Integer id);
-}
+package com.bsth.service.sys;
+
+import com.bsth.entity.sys.Role;
+import com.bsth.service.BaseService;
+
+import java.util.List;
+import java.util.Map;
+
+public interface RoleService extends BaseService<Role, Integer>{
+
+	Map<String, Object> findSubordinate();
+
+	Map<String, Object> add(Role role);
+
+	Map<String, Object> settRoleModules(Integer roleId, String mIds);
+
+	Map<String, Object> roleInfo(Integer id);
+
+	List<Role> findAllByIds(String ids);
+
+	boolean checkOperationLegality(Integer operationRoleId);
+}
-package com.bsth.service.sys;
-
-import com.bsth.entity.sys.SysUser;
-import com.bsth.service.BaseService;
-
-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();
-}
+package com.bsth.service.sys;
+
+import com.bsth.entity.sys.SysUser;
+import com.bsth.service.BaseService;
+
+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);
+
+    /**
+     * 检测指定用户密码是否过期
+     * @param userName 用户名
+     */
+	boolean validPWDExpired(String userName);
+
+	Map<String,Object> register(SysUser u);
+
+	List<SysUser> findAll_distinct();
+
+	Map<String, Object> resetPassword(Integer id, Integer pwdValidPeriod);
+
+	void recordLoginDate(String userName);
+
+	void realName(String jobCode, String realName, int id);
+}
+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));
+        }
+
+    }
+
+}
-package com.bsth.service.sys.impl;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.bsth.common.ResponseCode;
-import com.bsth.entity.sys.Module;
-import com.bsth.entity.sys.Role;
-import com.bsth.entity.sys.SysUser;
-import com.bsth.repository.sys.ModuleRepository;
-import com.bsth.repository.sys.RoleRepository;
-import com.bsth.service.impl.BaseServiceImpl;
-import com.bsth.service.sys.RoleService;
-
-@Service
-public class RoleServiceImpl extends BaseServiceImpl<Role, Integer> implements
-		RoleService {
-
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-
-	@Autowired
-	RoleRepository roleRepository;
-
-	@Autowired
-	ModuleRepository moduleRepository;
-	
-	SimpleDateFormat sdfMinute = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-
-	@Override
-	public Map<String, Object> save(Role t) {
-		if (t.getId() != null) {
-			// 更新
-			Map<String, Object> map = new HashMap<>();
-			try {
-				roleRepository.update(t.getCodeName(), t.getRoleName(),
-						t.isEnable(), t.getDescriptions(), t.getId());
-				map.put("status", ResponseCode.SUCCESS);
-			} catch (Exception e) {
-				map.put("status", ResponseCode.ERROR);
-			}
-			return map;
-		}
-		return super.save(t);
-	}
-
-	@Override
-	public Map<String, Object> settRoleModules(Integer roleId, String mIds) {
-
-		Map<String, Object> map = new HashMap<>();
-		try {
-			Role role = roleRepository.findOne(roleId);
-
-			List<Integer> idList = new ArrayList<>();
-			String[] array = mIds.split(",");
-			for (String id : array) {
-				if (null == id || id.trim().equals(""))
-					continue;
-				idList.add(Integer.parseInt(id));
-			}
-
-			Set<Module> mList = moduleRepository.findByIds(idList);
-			role.setModules(mList);
-			roleRepository.save(role);
-			map.put("status", ResponseCode.SUCCESS);
-		} catch (Exception e) {
-			logger.error("", e);
-			map.put("status", ResponseCode.ERROR);
-		}
-		return map;
-	}
-
-	@Override
-	public Map<String, Object> roleInfo(Integer id) {
-		Map<String, Object> map = new HashMap<>();
-		Role role = roleRepository.findOne(id);
-		map.put("codeName", role.getCodeName());
-		map.put("roleName", role.getRoleName());
-		map.put("createDate", sdfMinute.format(role.getCreateDate()));
-		map.put("updateDate", sdfMinute.format(role.getUpdateDate()));
-		map.put("enable", role.isEnable()==true?1:0);
-		map.put("descriptions", role.getDescriptions());
-		map.put("modules", role.getModules().size());
-		map.put("resources", role.getResources().size());
-		String userNames = "";
-		Set<SysUser> users = role.getUsers();
-		if(!users.isEmpty()){
-			Iterator<SysUser> it = users.iterator();
-			while(it.hasNext()){
-				SysUser user = it.next();
-				userNames = user.getUserName()+"...";
-			}
-		}
-		map.put("userNames", userNames);
-		return map;
-	}
-}
+package com.bsth.service.sys.impl;
+
+import java.beans.BeanInfo;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import com.bsth.security.util.SecurityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.entity.sys.Module;
+import com.bsth.entity.sys.Role;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.repository.sys.ModuleRepository;
+import com.bsth.repository.sys.RoleRepository;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.sys.RoleService;
+
+@Service
+public class RoleServiceImpl extends BaseServiceImpl<Role, Integer> implements
+		RoleService {
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+
+	@Autowired
+	RoleRepository roleRepository;
+
+	@Autowired
+	ModuleRepository moduleRepository;
+	
+	SimpleDateFormat sdfMinute = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
+	@Override
+	public Map<String, Object> findSubordinate() {
+		SysUser user = SecurityUtils.getCurrentUser();
+		Iterator<Role> itRole = user.getRoles().iterator();
+		Role ro = new Role();
+		while(itRole.hasNext()){//判断是否有下一个
+			ro = itRole.next();
+		}
+		Map<String, Object> map = new HashMap<>();
+		List<Map<String, Object>> rsRoleList = new ArrayList<>();
+		try {
+			// 读取层次数据结果集列表
+			Iterator<Role> roleList = roleRepository.findAll().iterator();
+
+			// 节点列表（散列表，用于临时存储节点对象）
+			Map<String, Object> nodeList = new HashMap<>();
+			// 根节点
+			List rootlist = new ArrayList();
+			while(roleList.hasNext()){
+				Role role = roleList.next();
+				HashMap map0 = new HashMap();
+				map0.put("id", role.getId());
+				map0.put("roleCode", role.getRoleCode());
+				map0.put("upCode", role.getUpCode());
+				map0.put("roleName", role.getRoleName());
+				map0.put("codeName", role.getCodeName());
+				map0.put("level", role.getLevel());
+				map0.put("levelCode", role.getLevelCode());
+				nodeList.put(role.getLevelCode(), map0);
+			}
+			// 构造无序的多叉树
+			Set entrySet = nodeList.entrySet();
+			for (Iterator it = entrySet.iterator(); it.hasNext();) {
+				Map<String, Object> map1 = (HashMap) ((Map.Entry) it.next()).getValue();
+//				Map<String, Object> map1 = objectToMap(it.next());
+				if (map1.get("upCode") == null || map1.get("upCode").equals("")
+						|| Integer.parseInt(map1.get("upCode").toString()) == 0) {
+					// root = node;
+					rootlist.add(map1);
+				} else {
+					Map<String, Object> tempmap = ((HashMap)nodeList.get((Integer.parseInt(map1.get("level").toString())-1)+"_"+map1.get("upCode")));
+//					Map<String, Object> tempmap = objectToMap(nodeList.get((Integer.parseInt(map1.get("level").toString())-1)+"_"+map1.get("upCode")));
+					System.out.println(tempmap);
+
+					List templist = (List) tempmap.get("children");
+					if (null != templist) {
+						templist.add(map1);
+					} else {
+						templist = new ArrayList();
+						templist.add(map1);
+					}
+					tempmap.put("children", templist);
+				}
+			}
+			getRoleList(rootlist,ro.getLevelCode(),rsRoleList,false);
+
+			// 排序后输出
+//			ComparatorSysrole(rootlist);
+			map.put("list", rsRoleList);
+			map.put("status", ResponseCode.SUCCESS);
+			map.put("msg", "成功");
+		} catch (Exception e) {
+			map.put("status", ResponseCode.ERROR);
+			map.put("msg", e);
+			logger.error("error",e);
+		}
+		return map;
+	}
+
+	private void getRoleList(List<Map<String, Object>> list, String levelCode, List<Map<String, Object>> roleList,boolean isChildren){
+		try{
+			if(isChildren){
+				for (Map<String, Object> map : list) {
+					roleList.add(map);
+					List mapList = (List) map.get("children");
+					if (mapList != null && mapList.size() > 0) {
+						getRoleList(mapList,levelCode,roleList,isChildren);
+					}
+				}
+
+			} else {
+				for (Map<String, Object> map : list) {
+					if(map.get("levelCode").equals(levelCode)){
+						isChildren = true;
+						List mapList = (List) map.get("children");
+						if (mapList != null && mapList.size() > 0) {
+							getRoleList(mapList,levelCode,roleList,isChildren);
+						}
+						break;
+					} else {
+						List mapList = (List) map.get("children");
+						if (mapList != null && mapList.size() > 0) {
+							getRoleList(mapList,levelCode,roleList,isChildren);
+						}
+					}
+				}
+			}
+		} catch (Exception e) {
+			logger.error("error",e);
+		}
+	}
+
+	public Map<String, Object> objectToMap(Object obj) throws Exception {
+		if(obj == null)
+			return null;
+
+		Map<String, Object> map = new HashMap<>();
+
+		BeanInfo beanInfo = Introspector.getBeanInfo(obj.getClass());
+		PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
+		for (PropertyDescriptor property : propertyDescriptors) {
+			String key = property.getName();
+			if (key.compareToIgnoreCase("class") == 0) {
+				continue;
+			}
+			Method getter = property.getReadMethod();
+			Object value = getter!=null ? getter.invoke(obj) : null;
+			map.put(key, value);
+		}
+
+		return map;
+	}
+
+	private void ComparatorSysrole(List<HashMap> list) {
+		ComparatorSysrole comparator = new ComparatorSysrole();
+		Collections.sort(list, comparator);
+		for (HashMap map : list) {
+			List mapList = (List) map.get("children");
+			if (mapList != null && mapList.size() > 0) {
+				ComparatorSysrole(mapList);
+			}
+		}
+	}
+
+	private class ComparatorSysrole implements Comparator {
+		public int compare(Object arg0, Object arg1) {
+			HashMap role0 = (HashMap) arg0;
+			HashMap role1 = (HashMap) arg1;
+
+			// 首先比较父节点 相同比较 子 位序
+			Long role0Pid = (Long) (role0.get("upCode") == null ? (long) 0 : role0.get("upCode"));
+			Long role1Pid = (Long) (role1.get("upCode") == null ? (long) 0 : role1.get("upCode"));
+			int flag = role0Pid.compareTo(role1Pid);
+			if (flag == 0) {
+				return (Integer.valueOf(role0.get("roleIndex").toString())).compareTo(Integer.valueOf(role1.get(
+						"roleIndex").toString()));
+			} else {
+				return flag;
+			}
+		}
+	}
+
+	@Override
+	public Map<String, Object> add(Role role) {
+		Map<String, Object> rs = new HashMap();
+		try{
+			SysUser user = SecurityUtils.getCurrentUser();
+			Iterator<Role> itRole = user.getRoles().iterator();
+			Role ro = new Role();
+			while(itRole.hasNext()){//判断是否有下一个
+				ro = itRole.next();
+			}
+			int id = roleRepository.roleMaxId()+1;
+			role.setUpCode(ro.getRoleCode());
+			role.setLevel(ro.getLevel()+1);
+			role.setRoleCode(id);
+			role.setId(id);
+			return super.save(role);
+		}catch (Exception e){
+			logger.error("", e);
+			rs.put("status", ResponseCode.ERROR);
+			rs.put("msg", e.getMessage());
+		}
+		return rs;
+	}
+
+	@Override
+	public Map<String, Object> save(Role t) {
+		if (t.getId() != null) {
+			// 更新
+			Map<String, Object> map = new HashMap<>();
+			try {
+				roleRepository.update(t.getCodeName(), t.getRoleName(),
+						t.isEnable(), t.getDescriptions(), t.getId());
+				map.put("status", ResponseCode.SUCCESS);
+			} catch (Exception e) {
+				map.put("status", ResponseCode.ERROR);
+			}
+			return map;
+		}
+		return super.save(t);
+	}
+
+	@Override
+	public Map<String, Object> settRoleModules(Integer roleId, String mIds) {
+
+		Map<String, Object> map = new HashMap<>();
+		try {
+			Role role = roleRepository.findOne(roleId);
+
+			List<Integer> idList = new ArrayList<>();
+			String[] array = mIds.split(",");
+			for (String id : array) {
+				if (null == id || id.trim().equals(""))
+					continue;
+				idList.add(Integer.parseInt(id));
+			}
+
+			Set<Module> mList = moduleRepository.findByIds(idList);
+			role.setModules(mList);
+			roleRepository.save(role);
+			map.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			logger.error("", e);
+			map.put("status", ResponseCode.ERROR);
+		}
+		return map;
+	}
+
+	@Override
+	public Map<String, Object> roleInfo(Integer id) {
+		Map<String, Object> map = new HashMap<>();
+		Role role = roleRepository.findOne(id);
+		map.put("codeName", role.getCodeName());
+		map.put("roleName", role.getRoleName());
+		map.put("createDate", sdfMinute.format(role.getCreateDate()));
+		map.put("updateDate", sdfMinute.format(role.getUpdateDate()));
+		map.put("enable", role.isEnable()==true?1:0);
+		map.put("descriptions", role.getDescriptions());
+		map.put("modules", role.getModules().size());
+		map.put("resources", role.getResources().size());
+		String userNames = "";
+		Set<SysUser> users = role.getUsers();
+		if(!users.isEmpty()){
+			Iterator<SysUser> it = users.iterator();
+			while(it.hasNext()){
+				SysUser user = it.next();
+				userNames = user.getUserName()+"...";
+			}
+		}
+		map.put("userNames", userNames);
+		return map;
+	}
+
+	@Override
+	public List<Role> findAllByIds(String ids) {
+		return roleRepository.findAllById(ids);
+	}
+
+	@Override
+	public boolean checkOperationLegality(Integer operationRoleId){
+		boolean isLegality = false;
+		Map<String, Object> roleMap = findSubordinate();
+		isLegality = (roleMap.get(operationRoleId) == null ? true:false );
+		return isLegality;
+	}
+}
-package com.bsth.service.sys.impl;
-
-import com.bsth.common.ResponseCode;
-import com.bsth.entity.sys.SysUser;
-import com.bsth.repository.sys.SysUserRepository;
-import com.bsth.service.impl.BaseServiceImpl;
-import com.bsth.service.sys.SysUserService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Service
-public class SysUserServiceImpl extends BaseServiceImpl<SysUser, Integer> implements SysUserService{
-
-	@Autowired
-	SysUserRepository sysUserRepository;
-
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-	
-	@Override
-	public SysUser findByUserName(String name) {
-		return sysUserRepository.findByUserName(name);
-	}
-	
-	@Override
-	public Map<String, Object> save(SysUser t) {
-		// 
-		if(t.getPassword() == null || t.getPassword().trim().equals("")){
-			SysUser user = sysUserRepository.findOne(t.getId());
-			t.setPassword(user.getPassword());
-		}else{
-			t.setPassword(new BCryptPasswordEncoder(4).encode(t.getPassword()));
-		}
-		return super.save(t);
-	}
-
-	@Override
-	public int changeEnabled(int id, int enabled) {
-		sysUserRepository.changeEnabled(id,enabled);
-		return 0;
-	}
-
-	@Override
-	public int changePWD(int id,String newPWD) {
-		return sysUserRepository.changePWD(id,new BCryptPasswordEncoder(4).encode(newPWD));
-	}
-
-	@Override
-	public Map<String, Object> register(SysUser u) {
-		Map<String, Object> rs = new HashMap();
-		try{
-			//检查用户名是否存在
-			if(findByUserName(u.getUserName()) != null){
-				rs.put("status", ResponseCode.ERROR);
-				rs.put("msg", "用户名" + u.getUserName() + "已存在！");
-			}
-			else{
-				u.setPassword(new BCryptPasswordEncoder(4).encode(u.getPassword()));
-				rs = super.save(u);
-			}
-		}catch (Exception e){
-			logger.error("", e);
-			rs.put("status", ResponseCode.ERROR);
-			rs.put("msg", e.getMessage());
-		}
-		return rs;
-	}
-
-	@Override
-	public List<SysUser> findAll_distinct() {
-		return sysUserRepository.findAll_distinct();
-	}
-}
+package com.bsth.service.sys.impl;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.sys.util.RSAUtils;
+import com.bsth.email.entity.EmailBean;
+import com.bsth.entity.sys.Role;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.repository.sys.SysUserRepository;
+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.joda.time.DateTime;
+import org.joda.time.Days;
+import org.slf4j.Logger;
+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 java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class SysUserServiceImpl extends BaseServiceImpl<SysUser, Integer> implements SysUserService{
+
+	@Autowired
+	SysUserRepository sysUserRepository;
+
+	@Autowired
+	RoleService roleService;
+
+	// 发送邮件
+	@Autowired
+	private MailUtils mailUtils;
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+	
+	@Override
+	public SysUser findByUserName(String name) {
+		return sysUserRepository.findByUserName(name);
+	}
+	
+	@Override
+	public Map<String, Object> save(SysUser t) {
+		// 
+		if(t.getPassword() == null || t.getPassword().trim().equals("")){
+			SysUser user = sysUserRepository.findOne(t.getId());
+			t.setPassword(user.getPassword());
+		}else{
+			t.setPassword(new BCryptPasswordEncoder(4).encode(t.getPassword()));
+		}
+		return super.save(t);
+	}
+
+	@Override
+	public int changeEnabled(int id, int enabled) {
+		sysUserRepository.changeEnabled(id,enabled);
+		return 0;
+	}
+
+	@Override
+	public int changePWD(int id,String newPWD) {
+		return sysUserRepository.changePWD(id,new BCryptPasswordEncoder(4).encode(newPWD));
+	}
+
+    @Override
+    public boolean validPWDExpired(String userName) {
+        SysUser sysUser = this.sysUserRepository.findByUserName(userName);
+        if (sysUser == null) {
+            throw new RuntimeException("用户[" + userName + "]不存在！");
+        }
+        if (sysUser.getPwdValidPeriod() == null || sysUser.getLastPwdDate() == null) {
+            // 如果没有设定密码过期时间，判定为不过期
+            return true;
+        }
+        DateTime now = new DateTime();
+        DateTime lastPwdDate = new DateTime(sysUser.getLastPwdDate());
+        Integer now_period_days = Days.daysBetween(lastPwdDate, now).getDays();
+        Integer expiredTipDays = 3; // 密码过期提前提示天数
+        if (now_period_days < (sysUser.getPwdValidPeriod() - expiredTipDays)) {
+            return true;
+        } else if (now_period_days >= (sysUser.getPwdValidPeriod() - expiredTipDays) &&
+                now_period_days < sysUser.getPwdValidPeriod()) {
+            // 快过期前提示
+            throw new RuntimeException("当前用户密码还有[" + (sysUser.getPwdValidPeriod() - now_period_days) + "]天过期！");
+        } else {
+            throw new RuntimeException("当前用户密码已过期！");
+        }
+
+    }
+
+    @Override
+	public Map<String, Object> register(SysUser u) {
+		Map<String, Object> rs = new HashMap();
+		boolean isLegality = false;
+		Iterator<Role> itRole = u.getRoles().iterator();
+		Role ro = new Role();
+		while(itRole.hasNext()){//判断是否有下一个
+			ro = itRole.next();
+			if(roleService.checkOperationLegality(ro.getId())){
+				isLegality = true;
+			} else {
+				rs.put("status", ResponseCode.ERROR);
+				rs.put("msg", "用户权限不够，请联系管理员！");
+				return rs;
+			}
+		}
+		if(isLegality){
+			try{
+				//解密RSA
+				try{
+					u.setUserName(RSAUtils.decryptBase64(u.getUserName()));
+					u.setPassword(RSAUtils.decryptBase64(u.getPassword()));
+				}catch (RuntimeException e) {
+					rs.put("msg", "网络延迟，解密失败，请重新添加！");
+				}
+				//检查用户名是否存在
+				if(findByUserName(u.getUserName()) != null){
+					rs.put("status", ResponseCode.ERROR);
+					rs.put("msg", "用户名" + u.getUserName() + "已存在！");
+				}
+				else{
+					u.setPassword(new BCryptPasswordEncoder(4).encode(u.getPassword()));
+					rs = super.save(u);
+				}
+			}catch (Exception e){
+				logger.error("", e);
+				rs.put("status", ResponseCode.ERROR);
+				rs.put("msg", e.getMessage());
+			}
+		}else {
+			rs.put("status", ResponseCode.ERROR);
+			rs.put("msg", "用户权限不够，请联系管理员！");
+		}
+		return rs;
+	}
+
+	@Override
+	public List<SysUser> findAll_distinct() {
+		Map<String, Object> map = roleService.findSubordinate();
+		Object object = roleService.findSubordinate().get("list");
+		List<SysUser> rsList = new ArrayList<>();
+
+		// 有权限查看的角色
+//		List<Role> roleList = JSONArray.parseArray(map.get("list").toString(), Role.class);
+
+		try{
+			Gson gson = new Gson();
+			// 有权限查看的角色
+			List<Role> roleList = gson.fromJson(map.get("list").toString(), new TypeToken<List<Role>>(){}.getType());
+
+			if(roleList.size() != 0 && !roleList.isEmpty()){
+				// 遍历有权限查看的角色
+				Map<Integer,Role> roleMap = new HashMap<>();
+				for (Role role: roleList) {
+					roleMap.put(role.getId(),role);
+				}
+
+				List<SysUser> list = new ArrayList<>();
+				list = sysUserRepository.findAll_distinct();
+				for (SysUser sysUsers:list) {
+
+					Iterator<Role> itUser = sysUsers.getRoles().iterator();
+					Role roleUser = new Role();
+					while(itUser.hasNext()){//判断是否有下一个
+						roleUser = itUser.next();
+					}
+					// 添加权限内的用户
+					if(roleMap.get(roleUser.getId()) != null){
+						rsList.add(sysUsers);
+					}
+				}
+			}
+		} catch (Exception e){
+			logger.error("error", e);
+		}
+		return rsList;
+	}
+
+	@Override
+	@Transactional
+	public Map<String, Object> resetPassword(Integer id, Integer pwdValidPeriod){
+		Map<String, Object> rs = new HashMap();
+		try{
+			// 获取当前用户
+			SysUser user = SecurityUtils.getCurrentUser();
+			Iterator<Role> itRole = user.getRoles().iterator();
+			Role ro = new Role();
+			boolean Legality = false;
+			while(itRole.hasNext()){//判断是否有下一个
+				ro = itRole.next();
+				if(ro.getLevel() == 1)
+					Legality = true;
+			}
+			if(Legality){
+				String pwd = PwdGenerator.randomPassword(16);
+				user = sysUserRepository.findOne(id);
+				user.setPwdValidPeriod(pwdValidPeriod);
+				sysUserRepository.save(user);
+				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", "您不是管理员无权限重置其他用户密码");
+			}
+		}catch (Exception e){
+			logger.error("", e);
+			rs.put("status", ResponseCode.ERROR);
+			rs.put("msg", e.getMessage());
+		}
+		return rs;
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void recordLoginDate(String userName) {
+		sysUserRepository.recordLoginDate(userName);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void realName(String jobCode, String realName, int id) {
+		sysUserRepository.realName(jobCode, realName, id);
+	}
+}
@@ -12,17 +12,11 @@ public class IpUtils {
 		if (request == null) {
 			return "unknown";
 		}
-		String ip = request.getHeader("x-forwarded-for");
-		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-			ip = request.getHeader("Proxy-Client-IP");
-		}
+		String ip = null;
 		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
 			ip = request.getHeader("X-Forwarded-For");
 		}
 		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-			ip = request.getHeader("WL-Proxy-Client-IP");
-		}
-		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
 			ip = request.getHeader("X-Real-IP");
 		}
 		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+package com.bsth.util;
+
+import com.bsth.data.SystemParamCache;
+import com.bsth.email.SimpleMailSender;
+import com.bsth.email.entity.EmailBean;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author Hill
+ */
+@Component
+public class MailUtils {
+
+    private Tools tools = new Tools("mailbox.properties");
+
+    private SimpleMailSender sms = new SimpleMailSender(tools.getValue("username"),tools.getValue("password"));
+
+    /**
+     * 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(SystemParamCache.getMailAdmin(), mail);
+    }
+}
 \ No newline at end of file