Merge branch 'online' of http://git.dayaedu.com/yonge/cooleshow into zx_online_message

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/TokenController.java

@@ -313,7 +313,7 @@ public class TokenController extends BaseController {
         String base64ClientCredentials = Base64.getEncoder().encodeToString((dto.getClientId() + ":" + dto.getClientSecret()).getBytes());
 
         HttpHeaders headers = new HttpHeaders();
-        headers.add("Authorization", "Basic " + base64ClientCredentials);
+//        headers.add("Authorization", "Basic " + base64ClientCredentials);
         headers.setContentType(MediaType.MULTIPART_FORM_DATA);
 
         url += "?clientId=" + dto.getClientId();

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -220,6 +220,10 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         if (null == detail) {
             detail = new TeacherVo();
         }
+        if (detail.getDefaultSubject() == null && StringUtils.isNotBlank(detail.getSubjectId())) {
+            detail.setDefaultSubject(Long.parseLong(detail.getSubjectId().split(",")[0]));
+        }
+
         int num = DateUtil.daysBetween(new Date(), detail.getMembershipEndTime());
         detail.setMembershipDays(Math.max(num, 0));
         List<TeacherStyleVideo> teacherStyleVideos = teacherStyleVideoService.selectListByUserId(userId);