Merge branch 'open_gj' into 'master'

还原登录

See merge request !208
This commit is contained in:
2021-12-02 10:35:01 +08:00
2 changed files with 14 additions and 14 deletions
@@ -139,13 +139,13 @@ public class UserController {
try { try {
FjtUsers users = fjtUsersService.findById(userId); FjtUsers users = fjtUsersService.findById(userId);
if(users.getRole()==17 && type.equals("b")){ // if(users.getRole()==17 && type.equals("b")){
CookieUtils.removeCookie(request, response, "login_enterpriseuser_weixinid"); // CookieUtils.removeCookie(request, response, "login_enterpriseuser_weixinid");
response.sendRedirect("reqLoginPage"); // response.sendRedirect("reqLoginPage");
}else if(users.getRole()==12 && type.equals("bh")){ // }else if(users.getRole()==12 && type.equals("bh")){
CookieUtils.removeCookie(request, response, "login_enterpriseuser_weixinid"); // CookieUtils.removeCookie(request, response, "login_enterpriseuser_weixinid");
response.sendRedirect("bhydLoginPage?code="+model.getCode()); // response.sendRedirect("bhydLoginPage?code="+model.getCode());
}else{ // }else{
List<String> citys = userCityService.findSupportCityByUserId(userId); List<String> citys = userCityService.findSupportCityByUserId(userId);
if(citys == null || citys.isEmpty()){ if(citys == null || citys.isEmpty()){
citys = Arrays.asList("上海"); citys = Arrays.asList("上海");
@@ -156,7 +156,7 @@ public class UserController {
// citys = userCityService.findSupportCityByUserId(userId); // citys = userCityService.findSupportCityByUserId(userId);
// } // }
model.setCitys(citys); model.setCitys(citys);
} // }
} catch (Exception e) { } catch (Exception e) {
model.setCitys(new ArrayList<String>()); model.setCitys(new ArrayList<String>());
} }
@@ -164,11 +164,11 @@ public class UserController {
} else { } else {
CookieUtils.removeCookie(request, response, "login_enterpriseuser_weixinid"); CookieUtils.removeCookie(request, response, "login_enterpriseuser_weixinid");
try { try {
if(type.equals("bh")){ // if(type.equals("bh")){
response.sendRedirect("bhydLoginPage?code="+model.getCode()); // response.sendRedirect("bhydLoginPage?code="+model.getCode());
}else{ // }else{
response.sendRedirect("reqLoginPage"); response.sendRedirect("reqLoginPage");
} // }
} catch (IOException e) { } catch (IOException e) {
} }
@@ -384,7 +384,7 @@ public class UserController {
return resultModel; return resultModel;
} }
CookieUtils.setCookie("login_user_id", user.getId() + "", "/", 60 * 60 * 24 *7, response); CookieUtils.setCookie("login_user_id", user.getId() + "", "/", 60 * 60 * 24 *7, response);
CookieUtils.setCookie("login_user_type", "bh", "/", 60 * 60 * 24 *7, response); CookieUtils.setCookie("login_user_type", "b", "/", 60 * 60 * 24 *7, response);
CookieUtils.setCookie("login_enterpriseuser_weixinid", weiXinId, "/", 60 * 60 * 24 *7, response); CookieUtils.setCookie("login_enterpriseuser_weixinid", weiXinId, "/", 60 * 60 * 24 *7, response);
resultModel.setResult(Message.RESULT_SUCCESS); resultModel.setResult(Message.RESULT_SUCCESS);
return resultModel; return resultModel;
@@ -135,7 +135,7 @@
if(re.result == "fail"){ if(re.result == "fail"){
$.toast(re.msg); $.toast(re.msg);
} else { } else {
window.location.href = "reqCityChoicePage?type=bh"; window.location.href = "reqCityChoicePage?type=b";
} }
},error:function (data, status) { },error:function (data, status) {
$.toast("发送失败,请重试"); $.toast("发送失败,请重试");