From 0a5d323cd73586d99c3637c40f0c9ecf927a04bf Mon Sep 17 00:00:00 2001 From: gaojuan Date: Thu, 2 Dec 2021 10:59:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=A4=E6=B5=B7=E5=8F=8A=E5=85=AC=E4=BC=97?= =?UTF-8?q?=E5=8F=B7=E7=99=BB=E5=BD=95=E4=BF=AE=E6=94=B9=20=E6=B8=A4?= =?UTF-8?q?=E6=B5=B7=E6=97=A0=E6=95=B0=E6=8D=AE=E8=BF=94=E5=9B=9Ebug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/weixin/UserController.java | 40 +++++++++++++------ .../weixin/WeiXinEvaluationController.java | 2 +- .../src/main/webapp/user/bhydLoginPage.ftl | 2 +- .../main/webapp/user/reqCityChoicePage.ftl | 4 +- .../com/fangjia/service/util/CookieUtils.java | 25 ++++++++++++ 5 files changed, 57 insertions(+), 16 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java index 4cc7424bf..bf65e845f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java @@ -85,7 +85,7 @@ public class UserController { try { if(StringUtils.isNotBlank(weiXinId) && StringUtils.isNotBlank(cacheWeiXinId)){ System.out.println("cookie weiXinId:"+weiXinId); - response.sendRedirect("reqCityChoicePage?type=b&code="+model.getCode()); + response.sendRedirect("reqCityChoicePage?type=bh&code="+model.getCode()); } } catch (IOException e) { e.printStackTrace(); @@ -127,33 +127,49 @@ public class UserController { if(weiXinId != null && !weiXinId.equals("")){ CookieUtils.setCookie("we_chat_open_id", weiXinId, "/", 60 * 60 * 24 *7, response); } - System.out.println("微信OPEN_ID:" + weiXinId); + System.out.println("reqCityChoicePage 微信OPEN_ID:" + weiXinId); //企业用户入口查询企业账户开通的城市 - if(type.equals("b")){ + if(type.equals("b") || type.equals("bh")){ //Boolean isLogin = usersInfoService.checkEnterpriseWeiXinUserIsLogin(weiXinId); String cacheWeiXinId = CookieUtils.getCookieValue(request,"login_enterpriseuser_weixinid"); - if(cacheWeiXinId != null) { - Long userId = Long.parseLong(CookieUtils.getCookieValue(request,"login_user_id")); + String loginUserIdstr = CookieUtils.getCookieValue(request,"login_user_id"); + if(cacheWeiXinId != null && StringUtils.isNotBlank(loginUserIdstr)) { + Long userId = Long.parseLong(loginUserIdstr); CookieUtils.setCookie("login_user_id", userId + "", "/", 60 * 60 * 24 *7, response); try { FjtUsers users = fjtUsersService.findById(userId); - List citys = userCityService.findSupportCityByUserId(userId); - if(citys == null || citys.isEmpty()){ - citys = Arrays.asList("上海"); - } + + if(users.getRole()==17 && type.equals("b")){ + CookieUtils.removeCookie(request, response, "login_enterpriseuser_weixinid"); + response.sendRedirect("reqLoginPage"); + }else if(users.getRole()==12 && type.equals("bh")){ + CookieUtils.removeCookie(request, response, "login_enterpriseuser_weixinid"); + response.sendRedirect("bhydLoginPage?code="+model.getCode()); + }else{ + List citys = userCityService.findSupportCityByUserId(userId); + if(citys == null || citys.isEmpty()){ + citys = Arrays.asList("上海"); + } // if(users!=null && users.getRole() == 12){ // citys = Arrays.asList("上海"); // }else{ // citys = userCityService.findSupportCityByUserId(userId); // } - model.setCitys(citys); + model.setCitys(citys); + } } catch (Exception e) { model.setCitys(new ArrayList()); } } else { + CookieUtils.removeCookie(request, response, "login_enterpriseuser_weixinid"); try { - response.sendRedirect("bhydLoginPage?code="+model.getCode()); + if(type.equals("bh")){ + response.sendRedirect("bhydLoginPage?code="+model.getCode()); + }else{ + response.sendRedirect("reqLoginPage"); + } + } catch (IOException e) { } } @@ -368,7 +384,7 @@ public class UserController { return resultModel; } CookieUtils.setCookie("login_user_id", user.getId() + "", "/", 60 * 60 * 24 *7, response); - CookieUtils.setCookie("login_user_type", "b", "/", 60 * 60 * 24 *7, response); + CookieUtils.setCookie("login_user_type", "bh", "/", 60 * 60 * 24 *7, response); CookieUtils.setCookie("login_enterpriseuser_weixinid", weiXinId, "/", 60 * 60 * 24 *7, response); resultModel.setResult(Message.RESULT_SUCCESS); return resultModel; diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java index 6e72df050..a58bf3fc1 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java @@ -454,7 +454,7 @@ public class WeiXinEvaluationController { System.out.println("渤海地址搜索 "+evaluation.getAddress()); List bhDists = BHBankUtils.getDistrictByBhbank(evaluation.getAddress()); JSONObject o = null; - if(bhDists.size()<1){ + if(bhDists.size()<1 && bhDists.size()>0){ bhDists = BHBankUtils.getDistrictByBhbank(district.getName()); o = bhDists.get(0); }else if(bhDists.size()>1){ diff --git a/projects/fangjia-open/src/main/webapp/user/bhydLoginPage.ftl b/projects/fangjia-open/src/main/webapp/user/bhydLoginPage.ftl index 11b6bd390..237b2b5f1 100644 --- a/projects/fangjia-open/src/main/webapp/user/bhydLoginPage.ftl +++ b/projects/fangjia-open/src/main/webapp/user/bhydLoginPage.ftl @@ -135,7 +135,7 @@ if(re.result == "fail"){ $.toast(re.msg); } else { - window.location.href = "reqCityChoicePage?type=b"; + window.location.href = "reqCityChoicePage?type=bh"; } },error:function (data, status) { $.toast("鍙戦�佸け璐ワ紝璇烽噸璇�"); diff --git a/projects/fangjia-open/src/main/webapp/user/reqCityChoicePage.ftl b/projects/fangjia-open/src/main/webapp/user/reqCityChoicePage.ftl index 5575699f0..bec5686af 100644 --- a/projects/fangjia-open/src/main/webapp/user/reqCityChoicePage.ftl +++ b/projects/fangjia-open/src/main/webapp/user/reqCityChoicePage.ftl @@ -42,7 +42,7 @@
- <#if type?? && type == 'b' && (citys??&&citys?size>0)> + <#if type?? && (type == 'b' || type == 'bh') && (citys??&&citys?size>0)>
<#list citys as bo>

${bo}

@@ -54,7 +54,7 @@
- <#if type?? && type == 'c' || type == 'b' && (citys??&&citys?size=0)> + <#if type?? && type == 'c' || type == 'b' || type=='bh' && (citys??&&citys?size=0)>
褰撳墠瀹氫綅鍩庡競
diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/util/CookieUtils.java b/projects/fangjia-service/src/main/java/com/fangjia/service/util/CookieUtils.java index 79fe7a4ed..1a3f74114 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/util/CookieUtils.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/util/CookieUtils.java @@ -1,5 +1,7 @@ package com.fangjia.service.util; +import org.apache.commons.lang.StringUtils; + import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -29,6 +31,29 @@ public class CookieUtils { } + public static boolean removeCookie(HttpServletRequest request, HttpServletResponse response, String name) { + if(request.getCookies() == null){ + return false; + } + if (StringUtils.isBlank(name)) { + return false; + } + Cookie[] cookies = request.getCookies(); + if (null != cookies) { + for (Cookie cookie : cookies) { + if (name.equals(cookie.getName())) { + cookie.setValue(null); + cookie.setMaxAge(0); + cookie.setPath("/"); + response.addCookie(cookie); + return true; + } + } + } + return false; + } + + public static void setCookie(String name, String value, String path,int maxAge, HttpServletResponse response){ Cookie cookie = new Cookie(name, value); if(path != null){