修改设备管理 外部登录

device-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
 import com.mortals.framework.service.IAuthTokenService;
 import com.mortals.framework.util.*;
 import com.mortals.xhx.base.system.menu.model.MenuEntity;
@@ -20,6 +21,7 @@ import com.mortals.xhx.common.key.RedisKey;
 import com.mortals.xhx.base.system.site.service.SiteService;
 import com.mortals.xhx.daemon.task.CustomerInfo;
 import io.jsonwebtoken.Claims;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +42,7 @@ import com.mortals.framework.web.BaseCRUDJsonController;
 
 @RestController
 @RequestMapping("login")
+@Slf4j
 public class LoginController extends BaseCRUDJsonController<UserService, UserForm, UserEntity, Long> {
 
     @Autowired
@@ -135,11 +138,12 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
     public String index(HttpServletRequest request, HttpServletResponse response) throws Exception {
         JSONObject ret = new JSONObject();
         IUser user = this.getCurUser();
-        if (user == null) {
-            user = super.getCurUser();
         if (user == null) {
             return "";
-            }
+//            user = super.getCurUser();
+//            if (user == null) {
+//                return "";
+//            }
         }
         Set<String> urls = resourceService.findUrlSetByUserId(user.getId());
         List<MenuEntity> outlookBarList = menuService.findTreeMenu(user, urls);
@@ -322,6 +326,7 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
                 Map objMap = claims.get("userInfo", Map.class);
                 CustomerInfo userInfo =new CustomerInfo();
                 BeanUtil.fillBeanWithMap(objMap,userInfo,true);
+                log.info("userInfo:{}", JSON.toJSONString(userInfo));
                 if (!ObjectUtils.isEmpty(userInfo)
                         && !ObjectUtils.isEmpty(userInfo.getId())
                         && !ObjectUtils.isEmpty(userInfo.getAccount())) {