|
|
|
@@ -31,6 +31,7 @@ import org.springframework.web.bind.annotation.*; |
|
|
|
import javax.imageio.ImageIO; |
|
|
|
import javax.servlet.ServletException; |
|
|
|
import javax.servlet.ServletOutputStream; |
|
|
|
import javax.servlet.http.Cookie; |
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
import java.awt.image.BufferedImage; |
|
|
|
import java.io.IOException; |
|
|
|
@@ -81,7 +82,7 @@ public class HomeController extends BaseController { |
|
|
|
|
|
|
|
@ApiOperation("登录") |
|
|
|
@PostMapping("/doLogin") |
|
|
|
public ResultData login(@RequestBody MallUserInfo user) { |
|
|
|
public ResultData login(@RequestBody MallUserInfo user, HttpServletResponse response) { |
|
|
|
logger.debug("[" + getIpAddr() + "] HomeController::login"); |
|
|
|
try { |
|
|
|
String kaptcha = ShiroUtils.getKaptcha(Constants.KAPTCHA_SESSION_KEY); |
|
|
|
@@ -114,6 +115,11 @@ public class HomeController extends BaseController { |
|
|
|
if(menus != null) { |
|
|
|
info.setMenus(menus); |
|
|
|
} |
|
|
|
|
|
|
|
Cookie unameCookie = new Cookie("uname", info.getUsername()); |
|
|
|
unameCookie.setMaxAge(60); |
|
|
|
response.addCookie(unameCookie); |
|
|
|
|
|
|
|
data.data = info; |
|
|
|
} catch (Exception e) { |
|
|
|
return new ResultData(ErrorCode.USER_PASSWD_ERR); |
|
|
|
@@ -130,7 +136,7 @@ public class HomeController extends BaseController { |
|
|
|
|
|
|
|
@ApiOperation("B端登录") |
|
|
|
@PostMapping("/bHidLogin") |
|
|
|
public ResultData bLogin(@RequestBody MallUserInfo user) { |
|
|
|
public ResultData bLogin(@RequestBody MallUserInfo user, HttpServletResponse response) { |
|
|
|
logger.debug("[" + getIpAddr() + "] HomeController::bHidLogin"); |
|
|
|
ResultData data = new ResultData(); |
|
|
|
// tenantId is appId |
|
|
|
@@ -177,6 +183,10 @@ public class HomeController extends BaseController { |
|
|
|
if(menus != null) { |
|
|
|
info.setMenus(menus); |
|
|
|
} |
|
|
|
Cookie unameCookie = new Cookie("uname", info.getUsername()); |
|
|
|
unameCookie.setMaxAge(60); |
|
|
|
response.addCookie(unameCookie); |
|
|
|
|
|
|
|
data.data = info; |
|
|
|
} catch (Exception e) { |
|
|
|
return new ResultData(ErrorCode.USER_PASSWD_ERR); |
|
|
|
@@ -210,7 +220,7 @@ public class HomeController extends BaseController { |
|
|
|
|
|
|
|
@ApiOperation(value = "手机验证码登录", notes = "{\"phone\",\"string\",\"code\",\"string\"}") |
|
|
|
@PostMapping("/doLoginByPhone") |
|
|
|
public ResultData doLoginByPhone(@RequestBody Map<String, String> params) { |
|
|
|
public ResultData doLoginByPhone(@RequestBody Map<String, String> params, HttpServletResponse response) { |
|
|
|
logger.debug("[" + getIpAddr() + "] HomeController::doLoginByPhone"); |
|
|
|
// String phone,String code,String pwd |
|
|
|
String phone = params.get("phone"); |
|
|
|
@@ -247,6 +257,11 @@ public class HomeController extends BaseController { |
|
|
|
if(menus != null) { |
|
|
|
info.setMenus(menus); |
|
|
|
} |
|
|
|
|
|
|
|
Cookie unameCookie = new Cookie("uname", info.getUsername()); |
|
|
|
unameCookie.setMaxAge(60); |
|
|
|
response.addCookie(unameCookie); |
|
|
|
|
|
|
|
return new ResultData(info); |
|
|
|
} catch (Exception e) { |
|
|
|
return new ResultData(ErrorCode.USER_PASSWD_ERR); |
|
|
|
|