Merge remote-tracking branch 'origin/master'

edu-auth/edu-auth-server/src/main/resources/banner.txt

@@ -0,0 +1,8 @@
+ ________  ________  ___       _______      ___    ___ ___  ___  ___     
+|\   ____\|\   __  \|\  \     |\  ___ \    |\  \  /  /|\  \|\  \|\  \    
+\ \  \___|\ \  \|\  \ \  \    \ \   __/|   \ \  \/  / | \  \ \  \\\  \   
+ \ \  \    \ \  \\\  \ \  \    \ \  \_|/__  \ \    / / \ \  \ \  \\\  \  
+  \ \  \____\ \  \\\  \ \  \____\ \  \_|\ \  /     \/   \ \  \ \  \\\  \ 
+   \ \_______\ \_______\ \_______\ \_______\/  /\   \    \ \__\ \_______\
+    \|_______|\|_______|\|_______|\|_______/__/ /\ __\    \|__|\|_______|
+                                           |__|/ \|__|                   

edu-cms/src/main/resources/banner.txt

@@ -0,0 +1,8 @@
+ ________  ________  ___       _______      ___    ___ ___  ___  ___     
+|\   ____\|\   __  \|\  \     |\  ___ \    |\  \  /  /|\  \|\  \|\  \    
+\ \  \___|\ \  \|\  \ \  \    \ \   __/|   \ \  \/  / | \  \ \  \\\  \   
+ \ \  \    \ \  \\\  \ \  \    \ \  \_|/__  \ \    / / \ \  \ \  \\\  \  
+  \ \  \____\ \  \\\  \ \  \____\ \  \_|\ \  /     \/   \ \  \ \  \\\  \ 
+   \ \_______\ \_______\ \_______\ \_______\/  /\   \    \ \__\ \_______\
+    \|_______|\|_______|\|_______|\|_______/__/ /\ __\    \|__|\|_______|
+                                           |__|/ \|__|                   

edu-eureka/src/main/resources/banner.txt

@@ -0,0 +1,8 @@
+ ________  ________  ___       _______      ___    ___ ___  ___  ___     
+|\   ____\|\   __  \|\  \     |\  ___ \    |\  \  /  /|\  \|\  \|\  \    
+\ \  \___|\ \  \|\  \ \  \    \ \   __/|   \ \  \/  / | \  \ \  \\\  \   
+ \ \  \    \ \  \\\  \ \  \    \ \  \_|/__  \ \    / / \ \  \ \  \\\  \  
+  \ \  \____\ \  \\\  \ \  \____\ \  \_|\ \  /     \/   \ \  \ \  \\\  \ 
+   \ \_______\ \_______\ \_______\ \_______\/  /\   \    \ \__\ \_______\
+    \|_______|\|_______|\|_______|\|_______/__/ /\ __\    \|__|\|_______|
+                                           |__|/ \|__|                   

edu-im/edu-im-server/src/main/java/com/keao/edu/im/http/HttpHelper.java

@@ -244,7 +244,7 @@ public class HttpHelper {
         return data;
     }
 
-    public String returnResult(HttpURLConnection conn, String body) throws Exception, IOException {
+    public String returnResult(HttpURLConnection conn, String body) throws Exception{
         InputStream input = null;
         if (conn.getResponseCode() == 200) {
             input = conn.getInputStream();

edu-im/edu-im-server/src/main/java/com/keao/edu/im/mec/im/IMHelper.java

@@ -518,11 +518,11 @@ public class IMHelper {
         }
 
         StringBuilder sb = new StringBuilder();
-        sb.append("&fromUserId=").append(URLEncoder.encode(fromUserId.toString(), UTF8));
+        sb.append("&fromUserId=").append(URLEncoder.encode(fromUserId, UTF8));
 
         //定向消息
         if (toUserId != null) {
-            sb.append("&toUserId=").append(URLEncoder.encode(toUserId.toString(), UTF8));
+            sb.append("&toUserId=").append(URLEncoder.encode(toUserId, UTF8));
         }
 
         for (int i = 0; i < toGroupId.length; i++) {

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

@@ -76,7 +76,7 @@ public class RoomServiceImpl implements RoomService {
         return baseResponse;
     }
 
-    /*public void exitRoom(String roomId,String userId){
+    public void exitRoom(String roomId,String userId){
         List<RoomMember> byRidAndRole = roomMemberDao.findByRidAndRole(roomId, 3);
         if(byRidAndRole != null && byRidAndRole.size() > 0){
             log.info("学员加入时，将其他学员退出房间 byRidAndRole{}",byRidAndRole);
@@ -85,17 +85,17 @@ public class RoomServiceImpl implements RoomService {
                     continue;
                 }
                 roomMemberDao.deleteUserByRidAndUid(roomId, e.getUid());
-                MemberChangedMessage msg = new MemberChangedMessage(MemberChangedMessage.Action_Leave, userId, 3);
-                msg.setUserName(e.getName());
+//                MemberChangedMessage msg = new MemberChangedMessage(MemberChangedMessage.Action_Leave, userId, 3);
+//                msg.setUserName(e.getName());
                 userDao.deleteByUid(userId);
-                try {
-                    imHelper.publishMessage(userId, roomId, msg);
-                } catch (Exception e1) {
-                    e1.printStackTrace();
-                }
+//                try {
+//                    imHelper.publishMessage(userId, roomId, msg);
+//                } catch (Exception e1) {
+//                    e1.printStackTrace();
+//                }
             }
         }
-    }*/
+    }
 
     public void joinRoomSuccess(RoomMember roomMember) throws Exception {
         String roomId = roomMember.getRid();
@@ -213,6 +213,17 @@ public class RoomServiceImpl implements RoomService {
         roomResult.setRoomId(roomId);
         if (registrationId != null){
             roomResult.setRegistrationId(registrationId);
+            List<RoomMember> byRidAndRole = roomMemberDao.findByRidAndRole(roomId, 3);
+            if(byRidAndRole != null && byRidAndRole.size() > 0){
+                log.info("学员加入时，将其他学员退出房间 byRidAndRole{}",byRidAndRole);
+                for (RoomMember e: byRidAndRole) {
+                    if (e.getUid().equals(userId)) {
+                        continue;
+                    }
+                    roomMemberDao.deleteUserByRidAndUid(roomId, e.getUid());
+                    userDao.deleteByUid(userId);
+                }
+            }
         }
         roomResult.setExamFlag(examRoom.getExamFlag());
         roomResult.setMembers(roomMemberDao.findByRid(roomId),examRoom.getShieldUserId());

edu-im/edu-im-server/src/main/resources/banner.txt

@@ -0,0 +1,8 @@
+ ________  ________  ___       _______      ___    ___ ___  ___  ___     
+|\   ____\|\   __  \|\  \     |\  ___ \    |\  \  /  /|\  \|\  \|\  \    
+\ \  \___|\ \  \|\  \ \  \    \ \   __/|   \ \  \/  / | \  \ \  \\\  \   
+ \ \  \    \ \  \\\  \ \  \    \ \  \_|/__  \ \    / / \ \  \ \  \\\  \  
+  \ \  \____\ \  \\\  \ \  \____\ \  \_|\ \  /     \/   \ \  \ \  \\\  \ 
+   \ \_______\ \_______\ \_______\ \_______\/  /\   \    \ \__\ \_______\
+    \|_______|\|_______|\|_______|\|_______/__/ /\ __\    \|__|\|_______|
+                                           |__|/ \|__|                   

edu-task/src/main/resources/banner.txt

@@ -0,0 +1,8 @@
+ ________  ________  ___       _______      ___    ___ ___  ___  ___     
+|\   ____\|\   __  \|\  \     |\  ___ \    |\  \  /  /|\  \|\  \|\  \    
+\ \  \___|\ \  \|\  \ \  \    \ \   __/|   \ \  \/  / | \  \ \  \\\  \   
+ \ \  \    \ \  \\\  \ \  \    \ \  \_|/__  \ \    / / \ \  \ \  \\\  \  
+  \ \  \____\ \  \\\  \ \  \____\ \  \_|\ \  /     \/   \ \  \ \  \\\  \ 
+   \ \_______\ \_______\ \_______\ \_______\/  /\   \    \ \__\ \_______\
+    \|_______|\|_______|\|_______|\|_______/__/ /\ __\    \|__|\|_______|
+                                           |__|/ \|__|                   

edu-user/edu-student-server/src/main/resources/banner.txt

@@ -0,0 +1,8 @@
+ ________  ________  ___       _______      ___    ___ ___  ___  ___     
+|\   ____\|\   __  \|\  \     |\  ___ \    |\  \  /  /|\  \|\  \|\  \    
+\ \  \___|\ \  \|\  \ \  \    \ \   __/|   \ \  \/  / | \  \ \  \\\  \   
+ \ \  \    \ \  \\\  \ \  \    \ \  \_|/__  \ \    / / \ \  \ \  \\\  \  
+  \ \  \____\ \  \\\  \ \  \____\ \  \_|\ \  /     \/   \ \  \ \  \\\  \ 
+   \ \_______\ \_______\ \_______\ \_______\/  /\   \    \ \__\ \_______\
+    \|_______|\|_______|\|_______|\|_______/__/ /\ __\    \|__|\|_______|
+                                           |__|/ \|__|                   

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

@@ -1,9 +1,7 @@
 package com.keao.edu.controller;
 
-import com.keao.edu.auth.api.client.SysUserFeignService;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.user.service.EmployeeService;
 import com.keao.edu.user.service.StudentExamResultService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -24,10 +22,6 @@ public class StudentExamResultController extends BaseController {
 
     @Autowired
     private StudentExamResultService studentExamResultService;
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
-    @Autowired
-    private EmployeeService employeeService;
 
     @ApiOperation("确认考生")
     @PostMapping(value = "/confirmStudent")

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

@@ -0,0 +1,36 @@
+package com.keao.edu.controller;
+
+
+import com.keao.edu.common.controller.BaseController;
+import com.keao.edu.common.tenant.TenantContextHolder;
+import com.keao.edu.user.service.SysConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 系统配置控制层
+ */
+@RestController
+@Api(tags = "系统参数设置")
+@RequestMapping(value = "sysConfig")
+public class SysConfigController extends BaseController {
+
+	@Autowired
+	private SysConfigService sysConfigService;
+
+	@ApiOperation(value = "查询参数")
+	@GetMapping(value = "queryByParamName")
+	public Object queryByParamName(String paramName) {
+		if(StringUtils.isBlank(paramName)){
+			return failed("参数不能为空");
+		}
+		String tenantId = TenantContextHolder.getTenantId();
+		return succeed(sysConfigService.findByParamName(paramName,tenantId));
+	}
+}

edu-user/edu-teacher-server/src/main/resources/banner.txt

@@ -0,0 +1,8 @@
+ ________  ________  ___       _______      ___    ___ ___  ___  ___     
+|\   ____\|\   __  \|\  \     |\  ___ \    |\  \  /  /|\  \|\  \|\  \    
+\ \  \___|\ \  \|\  \ \  \    \ \   __/|   \ \  \/  / | \  \ \  \\\  \   
+ \ \  \    \ \  \\\  \ \  \    \ \  \_|/__  \ \    / / \ \  \ \  \\\  \  
+  \ \  \____\ \  \\\  \ \  \____\ \  \_|\ \  /     \/   \ \  \ \  \\\  \ 
+   \ \_______\ \_______\ \_______\ \_______\/  /\   \    \ \__\ \_______\
+    \|_______|\|_______|\|_______|\|_______/__/ /\ __\    \|__|\|_______|
+                                           |__|/ \|__|                   

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExamRoomServiceImpl.java

@@ -812,11 +812,12 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 			examRoom.setExamFlag(openFlag);
 		}
 		examRoomDao.update(examRoom);
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
+//		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		String userId = examRoom.getMainTeacherUserId().toString();
 		PublishMessageDto publishMessageDto = new PublishMessageDto();
-		publishMessageDto.setUserId(sysUser.getId().toString());
+		publishMessageDto.setUserId(userId);
 		publishMessageDto.setRoomId(examRoomId.toString());
-		MemberChangedMessage msg = new MemberChangedMessage(5, sysUser.getId().toString(),3);
+		MemberChangedMessage msg = new MemberChangedMessage(5, userId,3);
 		msg.setAppParamJson(examCertificationService.basicNeedCheckingDetail(examRoomId));
 		publishMessageDto.setMemberChangedMessage(msg);
 		//加群退群
@@ -867,10 +868,9 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 			if(i == 0){
 				throw new BizException("操作失败：还有老师没完成评审");
 			}
-			imFeignService.publishMessage(publishMessageDto);
-//			imFeignService.dismissGroup(sysUser.getId().toString(),examRoomId.toString());
 			studentExamResultService.calculateStudentExamAvgScore(examRoomId);
-			imFeignService.destroyRoom(examRoomId,sysUser.getId().toString());
+			imFeignService.publishMessage(publishMessageDto);
+			imFeignService.destroyRoom(examRoomId,userId);
 		}
 	}
 

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExamSongServiceImpl.java

@@ -22,6 +22,7 @@ import com.keao.edu.util.collection.MapUtil;
 import com.keao.edu.util.excel.POIUtil;
 import com.keao.edu.util.iniFile.IniFileEntity;
 import com.keao.edu.util.iniFile.IniFileUtil;
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.PictureData;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -177,7 +178,6 @@ public class ExamSongServiceImpl extends BaseServiceImpl<Integer, ExamSong> impl
                                 objectMap.put("fileUrlList", pics.substring(1));
                             }
                         }
-
                         if (column.getValue().equals("type")) {
                             for (SongTypeEnum songType : SongTypeEnum.values()) {
                                 if (songType.getMsg().equals(row.get(s).toString())) {

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

@@ -69,7 +69,9 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
     public void add(Organization organ) {
         //获取当前用的organ
         SysUser queryUserInfo = sysUserFeignService.queryUserInfo();
-        Organization currentOrganization = organDao.findByUserId(queryUserInfo.getId());
+        Employee employee1 = employeeDao.get(queryUserInfo.getId());
+        Organization currentOrganization = organDao.get(employee1.getOrganId());
+//        Organization currentOrganization = organDao.findByUserId(queryUserInfo.getId());
         if (Objects.isNull(currentOrganization)) {
             throw new BizException("用户信息错误");
         }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/config/ResourceServerConfig.java

@@ -27,7 +27,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
         http.authorizeRequests()
                 .antMatchers("/task/*","/v2/api-docs", "/su/**", "/student/apply", "/examRegistration/ocr", "/examOrder/paymentResult",
                         "/examOrder/notify","/examinationBasic/getInfo","/examOrder/executePayment","/examOrder/pageList",
-                        "/studentExamResult/recordSync", "/appVersionInfo/queryByPlatform","tenantApply/add","/*/api/*")
+                        "/studentExamResult/recordSync", "/appVersionInfo/queryByPlatform","/tenantApply/add","/*/api/*")
                 .permitAll()
                 .anyRequest().authenticated().and().csrf().disable().exceptionHandling().accessDeniedHandler(baseAccessDeniedHandler)
                 .authenticationEntryPoint(baseAuthenticationEntryPoint).and();

edu-user/edu-user-server/src/main/resources/banner.txt

@@ -0,0 +1,8 @@
+ ________  ________  ___       _______      ___    ___ ___  ___  ___     
+|\   ____\|\   __  \|\  \     |\  ___ \    |\  \  /  /|\  \|\  \|\  \    
+\ \  \___|\ \  \|\  \ \  \    \ \   __/|   \ \  \/  / | \  \ \  \\\  \   
+ \ \  \    \ \  \\\  \ \  \    \ \  \_|/__  \ \    / / \ \  \ \  \\\  \  
+  \ \  \____\ \  \\\  \ \  \____\ \  \_|\ \  /     \/   \ \  \ \  \\\  \ 
+   \ \_______\ \_______\ \_______\ \_______\/  /\   \    \ \__\ \_______\
+    \|_______|\|_______|\|_______|\|_______/__/ /\ __\    \|__|\|_______|
+                                           |__|/ \|__|                   

edu-zuul/src/main/resources/banner.txt

@@ -0,0 +1,8 @@
+ ________  ________  ___       _______      ___    ___ ___  ___  ___     
+|\   ____\|\   __  \|\  \     |\  ___ \    |\  \  /  /|\  \|\  \|\  \    
+\ \  \___|\ \  \|\  \ \  \    \ \   __/|   \ \  \/  / | \  \ \  \\\  \   
+ \ \  \    \ \  \\\  \ \  \    \ \  \_|/__  \ \    / / \ \  \ \  \\\  \  
+  \ \  \____\ \  \\\  \ \  \____\ \  \_|\ \  /     \/   \ \  \ \  \\\  \ 
+   \ \_______\ \_______\ \_______\ \_______\/  /\   \    \ \__\ \_______\
+    \|_______|\|_______|\|_______|\|_______/__/ /\ __\    \|__|\|_______|
+                                           |__|/ \|__|