修改bug

Pu Zhibing

3 天以前 5dacdee9b54c78372b68140e2b068d03a620eab9

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java

@@ -5,7 +5,6 @@
import com.alibaba.fastjson.JSONObject;
import com.google.code.kaptcha.Constants;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.common.exception.InvalidKaptchaException;
import com.stylefeng.guns.core.log.LogManager;
import com.stylefeng.guns.core.log.factory.LogTaskFactory;
@@ -19,7 +18,6 @@
import com.stylefeng.guns.modular.system.dao.UserMapper;
import com.stylefeng.guns.modular.system.model.User;
import com.stylefeng.guns.modular.system.service.IMenuService;
import com.stylefeng.guns.modular.system.service.ITEnterpriseWithdrawalService;
import com.stylefeng.guns.modular.system.service.IUserService;
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
@@ -36,7 +34,6 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.context.request.RequestContextHolder;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -66,8 +63,8 @@
   @Autowired
   private IUserService userService;
   
   @Autowired
   private RedisTemplate redisTemplate;
   @Resource
   private RedisTemplate<String, String> redisTemplate;
   
   @Autowired
   private IShiro shiro;
@@ -79,9 +76,6 @@
   private Map<String, Long> loginTime = new HashMap<>();
   
   private Map<String, Integer> loginFailures = new HashMap<>();
	
   @Resource
   private ITEnterpriseWithdrawalService enterpriseWithdrawalService;
   
   
   /**
@@ -99,7 +93,7 @@
      //获取菜单列表
      User user = userMapper.getByAccount(loginUser.getImUser());
      if (null == user) {
         logOut();
         logOut(request);
         return null;
      }
      ShiroUser shiroUser = shiro.shiroUser(user);
@@ -120,8 +114,7 @@
      model.addAttribute("avatar", avatar);
      model.addAttribute("userName", user.getName());
      model.addAttribute("type", 0);
      String sessionId = RequestContextHolder.currentRequestAttributes().getSessionId();
      ShiroExtUtil.map.put(sessionId, shiroUser);
      redisTemplate.opsForValue().set(loginUser.getOnconUUID(), JSON.toJSONString(shiroUser), 10, TimeUnit.HOURS);
      return "/index.html";
   }
   
@@ -129,8 +122,9 @@
    * 退出登录
    */
   @RequestMapping(value = "/logout", method = RequestMethod.GET)
   public String logOut() {
      HttpUtil.get("https://testsso1.teamshub.com/logout?logouturl=https%3A%2F%2Fsso.teamshub.com%2Flogout%3F%0Alogoutat%3Dhttp%253A%252F%252F127.0.0.1%253A8010%252F");
   public String logOut(HttpServletRequest request) {
      request.getSession().invalidate();
      HttpUtil.get("https://passport.teamshub.com/logout?logouturl=https%3A%2F%2Fsso.teamshub.com%2Flogout%3F%0Alogoutat%3Dhttps%253A%252F%252Ftraffic.qytzt.cn%253A443%252F");
      return REDIRECT + "/";
   }