diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/IOutSideDataService.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/IOutSideDataService.java index 8030d19a..ba07653f 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/IOutSideDataService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/IOutSideDataService.java @@ -17,7 +17,7 @@ public interface IOutSideDataService { /** * 通过统一用户id获取用户的信息,如果是空,就是当前登录的用户 */ - UserData getUserInfoByUserId(String userId); + UserData getUserInfoByToken(String token); /** diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java index 795ab9ab..28710160 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java @@ -42,7 +42,7 @@ public class OutSideDataServiceImpl implements IOutSideDataService { @Override public List getUsersByAudienceId(String audienceId){ - String token = TokenProxy.getToken(request); + String token = TokenProxy.getBoeToken(request); String type="application/json"; String[] headers=new String[] {"token",token,"Content-Type",type}; String url= getBaseUrl("/audience/members"); @@ -85,9 +85,9 @@ public class OutSideDataServiceImpl implements IOutSideDataService { // } @Override - public UserData getUserInfoByUserId(String userId) { - - String token = TokenProxy.getBoeToken(request); + public UserData getUserInfoByToken(String token) { + //String token = TokenProxy.getBoeToken(request); + log.info("请求user/info: "+token); //String token="eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzIxMTI3NTUsImV4cCI6MTY3MjExOTk1NSwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.1348e0cfbb064d6d348d3976db3618974c1b1e8d2f6c6f45ae8294f09223f9b1"; String type="application/json"; @@ -208,9 +208,8 @@ public class OutSideDataServiceImpl implements IOutSideDataService { // } } } - - - + }else { + throw new RuntimeException("通过接口获取用户信息结果result错误:"+responseStr); } log.info("用户管理员:"+user.getAdminType()); //System.out.println("老师:"+user.getTeacher()); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java index a0ad81cd..6b745a70 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java @@ -3,6 +3,8 @@ package com.xboe.school.api; import java.util.HashMap; import java.util.Map; +import javax.servlet.http.HttpServletRequest; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -14,6 +16,7 @@ import com.xboe.common.utils.StringUtil; import com.xboe.core.CurrentUser; import com.xboe.core.JsonResponse; import com.xboe.core.api.ApiBaseController; +import com.xboe.core.api.TokenProxy; import com.xboe.data.dto.UserData; import com.xboe.data.outside.IOutSideDataService; import com.xboe.module.teacher.service.ITeacherService; @@ -53,7 +56,7 @@ public class PortalConsoleApi extends ApiBaseController{ * @return */ @RequestMapping(value="/init",method = {RequestMethod.GET}) - public JsonResponse> init() { + public JsonResponse> init(HttpServletRequest request) { Map map=new HashMap(); try { CurrentUser cuser=getCurrent(); @@ -62,8 +65,8 @@ public class PortalConsoleApi extends ApiBaseController{ log.error("未找到账号id【"+getCurrent().getAccountId()+"】对应的用户"); return error("账号错误,无此账号"); } - - UserData userData = outsideDataService.getUserInfoByUserId(null); + String token = TokenProxy.getBoeToken(request); + UserData userData = outsideDataService.getUserInfoByToken(token); if(userData==null) { log.error("通过api获取用用户信息错误【"+getCurrent().getAccountId()+"】对应的用户"); return error("未能获取当前用户信息"); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalLoginApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalLoginApi.java index a68f1264..b3ab534d 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalLoginApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalLoginApi.java @@ -211,7 +211,7 @@ public class PortalLoginApi extends ApiBaseController { // return wrap(JsonResponseStatus.TOKEN_NOPASS, "token error"); // } - UserData udata=outsideService.getUserInfoByUserId(null); + UserData udata=outsideService.getUserInfoByToken(token); if(udata==null) { log.error("未获取当前登录人的用户信息"); return wrap(JsonResponseStatus.TOKEN_NOPASS, "用户信息查询失败");