|
@@ -104,7 +104,7 @@ public class SysUserController {
|
|
|
@PostMapping(value = "/login")
|
|
|
public Result loginMultilevel(HttpServletRequest req, @RequestBody Map<String, String> map) {
|
|
|
String remoteHost = req.getRemoteHost();
|
|
|
- Result result = iSysUserService.loginMultilevel(req, map);
|
|
|
+ Result result = iSysUserService.loginMultilevel(req, map,remoteHost);
|
|
|
AccessToken accessToken = new AccessToken();
|
|
|
if (result.getCode() == 10000) {
|
|
|
SysUser user = (SysUser) result.getData();
|
|
@@ -134,12 +134,12 @@ public class SysUserController {
|
|
|
accessToken.setLoginIp(remoteHost);
|
|
|
}
|
|
|
if (result.getCode() == 10001) {
|
|
|
- return iSysUserService.loginMultilevel(req, map);
|
|
|
+ return iSysUserService.loginMultilevel(req, map,remoteHost);
|
|
|
}
|
|
|
return new Result(ResultCode.SUCCESS, accessToken);
|
|
|
}
|
|
|
|
|
|
- //TODO
|
|
|
+ //
|
|
|
@PostMapping(value = "/loginClient")
|
|
|
public Result loginClient(HttpServletRequest req, @RequestBody Map<String, String> map) {
|
|
|
|
|
@@ -154,7 +154,7 @@ public class SysUserController {
|
|
|
if (StringUtils.isEmpty(phone)){
|
|
|
return new Result(10001, "请输入手机号",false);
|
|
|
}
|
|
|
- Result result = iSysUserService.loginMultilevel(req, map);
|
|
|
+ Result result = iSysUserService.loginMultilevel(req, map,remoteHost);
|
|
|
if ( result.getCode() == 10000) {
|
|
|
SysUser sysUser = (SysUser) result.getData();
|
|
|
if (sysUser.getUserType() != 0 && sysUser.getUserType() != 4){
|
|
@@ -165,7 +165,7 @@ public class SysUserController {
|
|
|
}
|
|
|
if ("2".equals(loginType)){
|
|
|
// 未对密码加密
|
|
|
- Result result = iSysUserService.loginMultilevelClient(accountName, password);
|
|
|
+ Result result = iSysUserService.loginMultilevelClient(accountName, password,remoteHost);
|
|
|
if(result.getCode() == 10000){
|
|
|
|
|
|
SysUser accountEntity = (SysUser) result.getData();
|