diff --git a/pom.xml b/pom.xml
index aff8860..469ab34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
1.8
1.9.5
- 1.2.2
+ 2.0.0
7.6.11.v20130520
2.4
2.1
@@ -139,11 +139,11 @@
1.0-SNAPSHOT
-
- com.manage
- power-foundation
- 1.0-SNAPSHOT
-
+
+
+
+
+
com.manage
@@ -313,11 +313,11 @@
-
- org.webjars.bower
- jstree
- 3.3.4
-
+
+
+
+
+
@@ -363,58 +363,62 @@
${jedis.version}
-
- org.apache.solr
- solr-solrj
- ${solrj.version}
-
-
-
-
- com.manage
- framework-open-sdk
- ${framework.version}
-
-
-
- org.springframework.data
- spring-data-jpa
- 1.3.0.RELEASE
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- org.apache.shiro
- shiro-spring
- ${shiro.version}
-
-
- org.apache.shiro
- shiro-ehcache
- ${shiro.version}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- org.activiti
- activiti-engine
- ${activiti.version}
-
-
- org.activiti
- activiti-spring
- ${activiti.version}
-
-
-
-
- org.codehaus.groovy
- groovy-all
- ${groovy.version}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
com.mchange
diff --git a/power-admin/src/main/java/com/manage/controller/LoginController.java b/power-admin/src/main/java/com/manage/controller/LoginController.java
index 01b4484..9cd4d88 100644
--- a/power-admin/src/main/java/com/manage/controller/LoginController.java
+++ b/power-admin/src/main/java/com/manage/controller/LoginController.java
@@ -66,145 +66,143 @@ public class LoginController {
@ResponseBody
public Msg login(Power_User powerUser,HttpServletResponse response, HttpServletRequest request,Model model) throws Exception {
Jedis redis = JedisPoolUtil.getJedisPoolInstance().getResource();
- String userPwd = powerUser.getUserPwd();
- String userName = powerUser.getUserName();
- String userInfo = redis.get(userName);
- //用来记录错误的次数
- String errorPwsCount = "0";
- //没有这个id的话新建一个
- if (userInfo == null) {
- redis.set(userName, errorPwsCount);
- }
- //获取已经记录错误次数
- int i = Integer.parseInt(redis.get(userName));
- //小于5可以继续登录,大于5
- if (i < 5) {
try {
- Power_UserVo user = powerUserService.findPowerUserByUserNameAndUserPwd(powerUser);
- //添加进操作日志
- Power_Log log = new Power_Log();
- if( user != null){
- //如处于登录状态，先清除缓存
- //CacheManager.removeCacheByObject(user);
- //记住
- MyCookieUtil.remember(request, response);
- //清除用户登录错误次数缓存
- CacheManager.clearOnly(powerUser.getUserName());
- //存session密码置空
- //是否记住密码功能
- MyCookieUtil.remember(request, response);
- //设置token缓存
- String date = String.valueOf(DateUtils.getDate());
- String token = UUID.randomUUID().toString();
- //查询归属医院
- /* long start5 = System.currentTimeMillis();
- Power_User_Dict powerUserDict = powerUserDictMapper.selectDictIdByUserId(user.getUserId());
- long end5 = System.currentTimeMillis();
- System.out.println("查询医院时间="+(end5-start5)/1000.0+"s");
- user.setDictId(powerUserDict.getDictId());*/
- //科室id科室名
- ActionScopeUtils.setSessionAttribute("token",token,Integer.valueOf(String.valueOf(TOKEN_EXPIRE_TIME))/1000);
-
- //设置用户登录次数缓存
- SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
- CacheManager.addloginUserCount(fmt.format(new Date()),user.getUserName());
- CacheManager.addExcCount("noExc");
- List list = null;
- List menuList = new ArrayList<>();
- Set menus = new LinkedHashSet<>();
- if (user.getRoleId().equals(0) || user.getRoleId().equals(-100)) {
- list = powerMenuService.queryAllPowerMenu(null,user.getRoleId());
- } else {
- list = powerMenuService.selectUserAndRoleMenuListPower(user.getUserId(),null);
- }
- if(null != list && !list.isEmpty()){
- for (Power_Menu power_menu : list) {
- User_Dept_Menu deptMenu = new User_Dept_Menu();
- String menuUrl = power_menu.getMenuUrl();
- if (StringUtils.isNotBlank(menuUrl)) {
- BeanUtils.copyProperties(power_menu, deptMenu);
- deptMenu.setMethodParent(power_menu.getParentId());
- menuList.add(deptMenu);
- }
- if (StringUtils.isNotBlank(power_menu.getMethod())) {
- menus.add(power_menu.getMenuUrl());
- }
+ String userPwd = powerUser.getUserPwd();
+ String userName = powerUser.getUserName();
+ String userInfo = redis.get(userName);
+ //用来记录错误的次数
+ String errorPwsCount = "0";
+ //没有这个id的话新建一个
+ if (userInfo == null) {
+ redis.set(userName, errorPwsCount);
+ }
+ //获取已经记录错误次数
+ int i = Integer.parseInt(redis.get(userName));
+ //小于5可以继续登录,大于5
+ if (i < 5) {
+ try {
+ Power_UserVo user = powerUserService.findPowerUserByUserNameAndUserPwd(powerUser);
+ //添加进操作日志
+ Power_Log log = new Power_Log();
+ if( user != null){
+ //如处于登录状态，先清除缓存
+ //CacheManager.removeCacheByObject(user);
+ //记住
+ MyCookieUtil.remember(request, response);
+ //清除用户登录错误次数缓存
+ CacheManager.clearOnly(powerUser.getUserName());
+ //存session密码置空
+ //是否记住密码功能
+ MyCookieUtil.remember(request, response);
+ //设置token缓存
+ String date = String.valueOf(DateUtils.getDate());
+ String token = UUID.randomUUID().toString();
+ ActionScopeUtils.setSessionAttribute("token",token,Integer.valueOf(String.valueOf(TOKEN_EXPIRE_TIME))/1000);
+ //设置用户登录次数缓存
+ SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
+ CacheManager.addloginUserCount(fmt.format(new Date()),user.getUserName());
+ CacheManager.addExcCount("noExc");
+ List list = null;
+ List menuList = new ArrayList<>();
+ Set menus = new LinkedHashSet<>();
+ if (user.getRoleId().equals(0) || user.getRoleId().equals(-100)) {
+ list = powerMenuService.queryAllPowerMenu(null,user.getRoleId());
+ } else {
+ list = powerMenuService.selectUserAndRoleMenuListPower(user.getUserId(),null);
}
- }
- user.setMenuList(menuList);
- user.setMenus(menus);
- //设置科室
- StringBuilder power_depts = new StringBuilder();
- List power_depts1 = power_deptService.selectByPrimaryKeys(user.getDeptId());
- for(int j=0;j power_depts2 = power_deptService.selectByPrimaryKeys(user.getDeptIdQuality());
- for(int a=0;a power_depts1 = power_deptService.selectByPrimaryKeys(user.getDeptId());
+ for(int j=0;j power_depts2 = power_deptService.selectByPrimaryKeys(user.getDeptIdQuality());
+ for(int a=0;a