gic跳转登录

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/LoginController.java

@@ -2,26 +2,17 @@ package com.gic.haoban.manage.web.controller;
 
 import cn.hutool.crypto.SecureUtil;
 import cn.hutool.crypto.symmetric.AES;
-import com.alibaba.fastjson.JSONObject;
-import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
-import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.gic.commons.util.ToolUtil;
-import com.gic.commons.web.ResponseThreadLocal;
 import com.gic.haoban.common.utils.HaobanResponse;
-import com.gic.haoban.common.utils.StringUtil;
+import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
+import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.web.anno.IgnoreLogin;
 import com.gic.haoban.manage.web.auth.AuthRequestUtil;
 import com.gic.haoban.manage.web.config.Config;
@@ -30,17 +21,20 @@ import com.gic.haoban.manage.web.vo.LoginVO;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.dto.qywx.UserDTO;
 import com.gic.wechat.api.service.qywx.QywxCorpApiService;
-import com.gic.wechat.api.service.qywx.QywxUserApiService;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.view.RedirectView;
 
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletResponse;
 
 
 @RestController
@@ -148,27 +142,31 @@ public class LoginController extends WebBaseController{
 	//运维登录
 	@IgnoreLogin
 	@RequestMapping("gic-login")
-	public HaobanResponse ywLogin(String random,HttpServletResponse response) {
+	public ModelAndView ywLogin(String random,HttpServletResponse response) {
 		//判断是否存在random
 		AES aes = SecureUtil.aes(LOGIN_KEY.getBytes());
 		String o = aes.decryptStr(random);
 		if(o == null){
-			return resultResponse(HaoBanErrCode.ERR_4);
+			logger.info("解密异常");
+			ModelAndView model = new ModelAndView(new RedirectView("/haoban-3/#/gic-error", false));
+			return model;
 		}
 		JSONObject jsonObject = JSONObject.parseObject(o);
 		String gicEnterpriseId = jsonObject.getString("enterpriseId");
 		String loginPhoneNumber = jsonObject.getString("phoneNumber");
 		EnterpriseDetailDTO detailDTO = wxEnterpriseRelatedApiService.getByEnterpriseId(gicEnterpriseId);
 		if (null == detailDTO) {
-			logger.info("登录用户不存在!");
-			return resultResponse(HaoBanErrCode.ERR_6);
+			logger.info("登录失败，不存在对应企业");
+			ModelAndView model = new ModelAndView(new RedirectView("/haoban-3/#/gic-error", false));
+			return model;
 		}
 		SecureUtil.aes()
 		//TODO 获取超级管理员账号接口
 		StaffDTO staff = staffApiService.selectByNationcodeAndPhoneNumber(detailDTO.getWxEnterpriseId(), "86", loginPhoneNumber);
 		if (null == staff) {
 			logger.info("登录用户手机号不存在!");
-			return resultResponse(HaoBanErrCode.ERR_6);
+			ModelAndView model = new ModelAndView(new RedirectView("/haoban-3/#/gic-error", false));
+			return model;
 		}
 //		StaffDTO staff = staffApiService.selectById("1");
 		LoginVO loginVO = new LoginVO();
@@ -188,8 +186,8 @@ public class LoginController extends WebBaseController{
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
-		}	
-		return resultResponse(HaoBanErrCode.ERR_1);
+		}
+		return null;
 
 	}