Merge remote-tracking branch 'origin/developer' into developer

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

@@ -3,6 +3,7 @@ package com.gic.haoban.manage.web.controller;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -185,8 +186,22 @@ public class LoginController extends WebBaseController {
             return model;
         }
         JSONObject jsonObject = JSONObject.parseObject(o);
+        logger.info("登录信息={}",jsonObject.toString());
         String gicEnterpriseId = jsonObject.getString("enterpriseId");
         String loginPhoneNumber = jsonObject.getString("phoneNumber");
+        Long timestamp = jsonObject.getLong("timestamp") ;
+        if(null == timestamp || StringUtils.isAnyBlank(gicEnterpriseId,loginPhoneNumber)) {
+            logger.info("timestamp is null,gicEnterpriseId={},loginPhoneNumber={}", gicEnterpriseId, loginPhoneNumber);
+            ModelAndView model = new ModelAndView(
+                    new RedirectView("/haoban-3/#/gic-error?errorCode=1000", false, false));
+            return model;
+        }
+        if(timestamp+1000*60*5 < System.currentTimeMillis()) {
+            logger.info("登录超时gicEnterpriseId={},loginPhoneNumber={}", gicEnterpriseId, loginPhoneNumber);
+            ModelAndView model = new ModelAndView(
+                    new RedirectView("/haoban-3/#/gic-error?errorCode=1005", false, false));
+            return model;
+        }
         List<WxEnterpriseDTO> wxEnterpriseList = wxEnterpriseRelatedApiService.listWxEnterpriseByEid(gicEnterpriseId,
                 loginPhoneNumber);
         if (CollectionUtils.isEmpty(wxEnterpriseList)) {
@@ -217,12 +232,20 @@ public class LoginController extends WebBaseController {
      */
     @RequestMapping("get-login-qrcode")
     @Deprecated
-    public HaobanResponse getLoginQrcode() throws UnsupportedEncodingException {
-        String corpid = config.getCorpid();
+    public HaobanResponse getLoginQrcode(HttpServletResponse response) throws UnsupportedEncodingException {
+       /* String corpid = config.getCorpid();
         String redirectUri = config.getHost() + "login";
         String url = "https://open.work.weixin.qq.com/wwopen/sso/3rd_qrConnect?appid=" + corpid + "&redirect_uri="
-                + URLEncoder.encode(redirectUri, "UTF-8") + "&state=web_login@gyoss9&usertype=admin";
-        return resultResponse(HaoBanErrCode.ERR_1, URL.decode(url));
+                + URLEncoder.encode(redirectUri, "UTF-8") + "&state=web_login@gyoss9&usertype=admin";*/
+       // return resultResponse(HaoBanErrCode.ERR_1, URL.decode(url));
+        String gicHost = GlobalVar.ctxPropertiesMap.get("gicweb_service_host");
+        gicHost = gicHost.replace("gicweb", "").replace("https://", "http://").replace("http://", "https://")+"gic-web/#/login?ishb=1";
+        try {
+            response.sendRedirect(gicHost);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null ;
     }
 
     // 登录逻辑
@@ -467,6 +490,7 @@ public class LoginController extends WebBaseController {
         retMap.put("wxEnterpriseId", hbEnt);
         retMap.put("enterpriseId", gicEnterpriseId);
         retMap.put("phoneNumber", loginPhoneNumber);
+        retMap.put("timestamp", System.currentTimeMillis()+"") ;
         String ret = JSONObject.toJSONString(retMap);
         AES aes = SecureUtil.aes(LOGIN_KEY.getBytes());
         String random = aes.encryptHex(ret);