|
@@ -26,6 +26,7 @@ import cn.com.qmth.mps.entity.WxappInfoEntity;
|
|
import cn.com.qmth.mps.enums.Role;
|
|
import cn.com.qmth.mps.enums.Role;
|
|
import cn.com.qmth.mps.exception.ParameterExceptions;
|
|
import cn.com.qmth.mps.exception.ParameterExceptions;
|
|
import cn.com.qmth.mps.service.AuthService;
|
|
import cn.com.qmth.mps.service.AuthService;
|
|
|
|
+import cn.com.qmth.mps.service.SchoolService;
|
|
import cn.com.qmth.mps.service.SessionService;
|
|
import cn.com.qmth.mps.service.SessionService;
|
|
import cn.com.qmth.mps.service.UserService;
|
|
import cn.com.qmth.mps.service.UserService;
|
|
import cn.com.qmth.mps.service.WxappAccessTokenService;
|
|
import cn.com.qmth.mps.service.WxappAccessTokenService;
|
|
@@ -40,6 +41,8 @@ import sun.misc.BASE64Decoder;
|
|
@AuthorizationComponent
|
|
@AuthorizationComponent
|
|
@Service
|
|
@Service
|
|
public class AuthServiceImpl implements AuthorizationService<User>, AuthService {
|
|
public class AuthServiceImpl implements AuthorizationService<User>, AuthService {
|
|
|
|
+ @Autowired
|
|
|
|
+ private SchoolService schoolService;
|
|
@Autowired
|
|
@Autowired
|
|
private UserService userService;
|
|
private UserService userService;
|
|
@Autowired
|
|
@Autowired
|
|
@@ -83,6 +86,7 @@ public class AuthServiceImpl implements AuthorizationService<User>, AuthService
|
|
vo.setSessionId(user.getSessionId());
|
|
vo.setSessionId(user.getSessionId());
|
|
vo.setSchoolId(user.getSchoolId());
|
|
vo.setSchoolId(user.getSchoolId());
|
|
vo.setRole(user.getRole());
|
|
vo.setRole(user.getRole());
|
|
|
|
+ vo.setSchoolName(schoolService.getById(user.getSchoolId()).getName());
|
|
return vo;
|
|
return vo;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -117,6 +121,7 @@ public class AuthServiceImpl implements AuthorizationService<User>, AuthService
|
|
vo.setSessionId(user.getSessionId());
|
|
vo.setSessionId(user.getSessionId());
|
|
vo.setSchoolId(user.getSchoolId());
|
|
vo.setSchoolId(user.getSchoolId());
|
|
vo.setRole(user.getRole());
|
|
vo.setRole(user.getRole());
|
|
|
|
+ vo.setSchoolName(schoolService.getById(user.getSchoolId()).getName());
|
|
return vo;
|
|
return vo;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -202,6 +207,7 @@ public class AuthServiceImpl implements AuthorizationService<User>, AuthService
|
|
vo.setSessionId(user.getSessionId());
|
|
vo.setSessionId(user.getSessionId());
|
|
vo.setSchoolId(user.getSchoolId());
|
|
vo.setSchoolId(user.getSchoolId());
|
|
vo.setRole(user.getRole());
|
|
vo.setRole(user.getRole());
|
|
|
|
+ vo.setSchoolName(schoolService.getById(user.getSchoolId()).getName());
|
|
return vo;
|
|
return vo;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -305,6 +311,7 @@ public class AuthServiceImpl implements AuthorizationService<User>, AuthService
|
|
vo.setSessionId(user.getSessionId());
|
|
vo.setSessionId(user.getSessionId());
|
|
vo.setSchoolId(user.getSchoolId());
|
|
vo.setSchoolId(user.getSchoolId());
|
|
vo.setRole(user.getRole());
|
|
vo.setRole(user.getRole());
|
|
|
|
+ vo.setSchoolName(schoolService.getById(user.getSchoolId()).getName());
|
|
return vo;
|
|
return vo;
|
|
}
|
|
}
|
|
}
|
|
}
|