Merge remote-tracking branch 'origin/master'

edu-auth/edu-auth-server/src/main/resources/application.yml

@@ -81,7 +81,6 @@ management:
     health:
       show-details: ALWAYS
 
-
 ribbon:
   ReadTimeout: 60000
   ConnectTimeout: 60000

edu-im/edu-im-server/src/main/java/com/keao/edu/im/service/Impl/RoomServiceImpl.java

@@ -126,7 +126,7 @@ public class RoomServiceImpl implements RoomService {
         RoomResult.MemberResult userResult = new RoomResult.MemberResult();
         List<RoomMember> memberList = roomMemberDao.findByRidAndUid(roomId, userId);
         if (memberList.isEmpty()) {
-            if(userId.equals(examRoom.getMainTeacherUserId())){
+            if(sysUser.getId().equals(examRoom.getMainTeacherUserId())){
                 roleEnum = RoleEnum.MainTeacher;
             }else if(isAssistant){
                 roleEnum = RoleEnum.AssistantTeacher;

edu-im/edu-im-server/src/main/resources/application.yml

@@ -70,6 +70,10 @@ spring:
 swagger:
   base-package: com.keao.edu.im.controller
 
+ribbon:
+  ReadTimeout: 60000
+  ConnectTimeout: 60000
+
 ##认证
 security:
   oauth2:

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/client/EduUserFeignService.java

@@ -6,7 +6,9 @@ import com.keao.edu.user.api.client.fallback.EduUserFeignServiceFallback;
 import com.keao.edu.user.api.entity.ExamRoom;
 import com.keao.edu.user.api.entity.ExamRoomStudentRelation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @FeignClient(contextId = "eduUserFeignService", name = "user-server", configuration = { FeignConfiguration.class }, fallback = EduUserFeignServiceFallback.class)
 public interface EduUserFeignService {
@@ -16,7 +18,7 @@ public interface EduUserFeignService {
 	 * @param id
 	 * @return
 	 */
-	@GetMapping(value = "examRoom/get")
+	@PostMapping(value = "examRoom/api/get")
 	ExamRoom getExamRoom(@RequestParam("id") Integer id);
 
 	/**

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamRoomController.java

@@ -137,6 +137,12 @@ public class ExamRoomController extends BaseController {
         return succeed(examRoomService.get(id));
     }
 
+    @ApiOperation("获取教室")
+    @PostMapping(value = "/api/get")
+    public ExamRoom getApiExamRoom(Long id){
+        return examRoomService.get(id);
+    }
+
     @ApiOperation("获取考场统计信息")
     @GetMapping(value = "/getExamRoomStatisticsInfo")
     public HttpResponseResult<ExamRoomStatisticsDto> getExamRoomStatisticsInfo(Long examId){

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/OrganizationServiceImpl.java

@@ -96,7 +96,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 				if(!user.getUserType().contains("SYSTEM")){
 					user.setUserType(user.getUserType() + ",SYSTEM");
 				}
-				user.setRealName(organ.getName());
+				user.setRealName(organ.getContactName());
 				user.setPhone(organ.getContactPhone());
 				sysUserDao.update(user);
 			}else if(organization.getDelFlag() == YesOrNoEnum.YES){
@@ -106,6 +106,8 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 				}else {
 					sysUser.setUserType(sysUser1.getUserType() + ",SYSTEM");
 				}
+				sysUser.setRealName(organ.getContactName());
+				sysUser.setPhone(organ.getContactPhone());
 				sysUser.setId(sysUser1.getId());
 				sysUserDao.update(sysUser);
 				if(sysUser.getRoles() != null){
@@ -171,7 +173,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 				throw new BizException("手机号已存在");
 			}
 		}
-		sysUser.setRealName(organization.getName());
+		sysUser.setRealName(organization.getContactName());
 		sysUser.setPhone(organization.getContactPhone());
 		organization.setUserId(organization1.getUserId());
 		organDao.update(organization);

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/TenantInfoServiceImpl.java

@@ -79,7 +79,7 @@ public class TenantInfoServiceImpl extends BaseServiceImpl<Integer, TenantInfo>
 		organ.setLevel(0);
 		organ.setParentOrganIdTag(sysUser.getId().toString());
 		organ.setId(sysUser.getId());
-		organ.setName(sysUser.getRealName());
+		organ.setName(tenantInfo.getName());
 		organ.setContactName(tenantInfo.getContactName());
 		organ.setContactPhone(tenantInfo.getContactPhone());
 		organ.setIsAllowArrangeExam(1);

edu-user/edu-user-server/src/main/resources/application.yml

@@ -103,8 +103,8 @@ management:
       show-details: ALWAYS
       
 ribbon:
-    ReadTimeout: 60000  
-    ConnectTimeout: 60000
+  ReadTimeout: 60000
+  ConnectTimeout: 60000
 
 message:
   debugMode: true