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

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

@@ -2,8 +2,6 @@ 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;
@@ -22,7 +20,6 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.RedirectView;
 
-import com.alibaba.dubbo.common.URL;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.clerk.api.dto.ClerkDTO;
@@ -420,9 +417,14 @@ public class LoginController extends WebBaseController {
         String wxEnterpriseId = jsonObject.getString("wxEnterpriseId");
         String gicEnterpriseId = jsonObject.getString("enterpriseId");
         String phoneNumber = jsonObject.getString("phoneNumber");
+        Long timestamp = jsonObject.getLong("timestamp") ;
         logger.info("选择企微列表,gicEnterpriseId={},phoneNumber={}", gicEnterpriseId, phoneNumber);
-        if (StringUtils.isAnyBlank(gicEnterpriseId, phoneNumber)) {
-            return this.fail("商户id和手机号为空");
+        if (StringUtils.isAnyBlank(gicEnterpriseId, phoneNumber,timestamp+"")) {
+            return this.fail("参数异常");
+        }
+        if(timestamp+1000*60*5 < System.currentTimeMillis()) {
+            logger.info("登录超时gicEnterpriseId={},loginPhoneNumber={}", gicEnterpriseId,phoneNumber);
+            return this.fail("登录超时,请重新登录");
         }
         // 判断商户
         List<WxEnterpriseDTO> wxEnterpriseList = wxEnterpriseRelatedApiService.listWxEnterpriseByEid(gicEnterpriseId,