|
|
@@ -265,6 +265,7 @@ public class UserInfoController {
|
|
265
|
265
|
try {
|
|
266
|
266
|
String userInfoObject = mapper.writeValueAsString(userInfo);
|
|
267
|
267
|
HttpSession session = request.getSession();
|
|
|
268
|
+ System.out.println("存的sessionID================="+session.getId());
|
|
268
|
269
|
MySessionContext.AddSession(session);//将当前session存到静态map里
|
|
269
|
270
|
// 当前登录用户
|
|
270
|
271
|
session.setAttribute("userInfo", userInfoObject);
|
|
|
@@ -304,6 +305,7 @@ public class UserInfoController {
|
|
304
|
305
|
@ApiOperation(value="获取用户登录信息", notes = "获取用户登录信息")
|
|
305
|
306
|
public Map<String, Object> getLoginInfo(HttpServletRequest request) {
|
|
306
|
307
|
Map<String, Object> modelMap = new HashMap<>();
|
|
|
308
|
+ System.out.println("取的sessionID================="+request.getSession().getId());
|
|
307
|
309
|
try {
|
|
308
|
310
|
// JSON字符串转对象
|
|
309
|
311
|
ObjectMapper mapper = new ObjectMapper();
|
|
|
@@ -678,6 +680,7 @@ public class UserInfoController {
|
|
678
|
680
|
break;
|
|
679
|
681
|
}
|
|
680
|
682
|
String ip = getIpAddr(request);
|
|
|
683
|
+ System.out.println("当前ip:"+ip+";当前depotIp===="+depotIp);
|
|
681
|
684
|
if(!depotIp.equals("") && ip.substring(0,6).equals(NetStateUtil.getIpFromUrl(depotIp).substring(0,6))) {//当前ip是库内ip段的说明是库内访问
|
|
682
|
685
|
map.put("depotUrl", depotIp);
|
|
683
|
686
|
map.put("localOrCloud", 2);//访问应急端的时候直接设置为本地,不然智能仓房操作按钮出不来
|