Merge remote-tracking branch 'origin/master'

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/core/handler/BaseAuthenticationSuccessEventHandler.java

@@ -1,20 +1,22 @@
 package com.keao.edu.auth.core.handler;
 
-import java.io.IOException;
-import java.util.Base64;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.keao.edu.auth.api.entity.SysUser;
+import com.keao.edu.auth.api.entity.SysUserLogin;
+import com.keao.edu.auth.api.entity.SysUserLoginLog;
+import com.keao.edu.auth.api.util.SecurityConstants;
+import com.keao.edu.auth.service.SysUserLoginLogService;
+import com.keao.edu.auth.service.SysUserLoginService;
+import com.keao.edu.auth.service.SysUserService;
+import com.keao.edu.common.entity.HttpResponseResult;
+import com.keao.edu.im.api.client.ImFeignService;
+import com.keao.edu.im.api.entity.ImResult;
+import com.keao.edu.im.api.entity.ImUserModel;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -22,27 +24,18 @@ import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
 import org.springframework.security.oauth2.common.exceptions.UnapprovedClientAuthenticationException;
-import org.springframework.security.oauth2.provider.ClientDetails;
-import org.springframework.security.oauth2.provider.ClientDetailsService;
-import org.springframework.security.oauth2.provider.OAuth2Authentication;
-import org.springframework.security.oauth2.provider.OAuth2Request;
-import org.springframework.security.oauth2.provider.TokenRequest;
+import org.springframework.security.oauth2.provider.*;
 import org.springframework.security.oauth2.provider.token.AuthorizationServerTokenServices;
 import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
 import org.springframework.stereotype.Component;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.keao.edu.auth.api.entity.SysUser;
-import com.keao.edu.auth.api.entity.SysUserLogin;
-import com.keao.edu.auth.api.entity.SysUserLoginLog;
-import com.keao.edu.auth.api.util.SecurityConstants;
-import com.keao.edu.auth.service.SysUserLoginLogService;
-import com.keao.edu.auth.service.SysUserLoginService;
-import com.keao.edu.auth.service.SysUserService;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.im.api.client.ImFeignService;
-import com.keao.edu.im.api.entity.ImResult;
-import com.keao.edu.im.api.entity.ImUserModel;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Base64;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 @Component
 public class BaseAuthenticationSuccessEventHandler extends SavedRequestAwareAuthenticationSuccessHandler {
@@ -61,9 +54,6 @@ public class BaseAuthenticationSuccessEventHandler extends SavedRequestAwareAuth
 	@Autowired
 	private ClientDetailsService clientDetailsService;
 
-	@Value("${auth.sysconfig.tenantId}")
-	private Integer tenantClientId;
-
 	@Autowired
 	private AuthorizationServerTokenServices defaultAuthorizationServerTokenServices;
 

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/service/impl/SysUserServiceImpl.java

@@ -32,11 +32,6 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 	@Autowired
 	private ImFeignService imFeignService;
 
-	@Value("${message.autoRegister}")
-	private boolean autoRegister;
-	@Value("${auth.sysconfig.tenantId}")
-	private Integer lesseeOrganId;
-
 	@Override
 	public BaseDAO<Integer, SysUser> getDAO() {
 		return sysUserDao;
@@ -93,11 +88,9 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 	@Override
 	public boolean deleteById(Integer id) {
 		SysUser user = get(id);
-
 		if (user == null) {
 			throw new BizException("账户不存在");
 		}
-
 		user.setUpdateTime(new Date());
 		user.setDelFlag(1);
 

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

@@ -87,9 +87,4 @@ ribbon:
   ConnectTimeout: 60000
 
 message:
-  autoRegister: true
-  debugMode: true
-
-auth:
-  sysconfig:
-    tenantId: 1
+  debugMode: true

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

@@ -1,23 +1,5 @@
 package com.keao.edu.im.service.Impl;
 
-import com.keao.edu.im.whiteboard.WhiteBoardHelper;
-import io.rong.models.message.GroupMessage;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import lombok.extern.slf4j.Slf4j;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.alibaba.fastjson.JSONObject;
 import com.keao.edu.auth.api.client.SysUserFeignService;
 import com.keao.edu.auth.api.entity.SysUser;
@@ -33,41 +15,28 @@ import com.keao.edu.im.dao.UserDao;
 import com.keao.edu.im.dao.WhiteboardDao;
 import com.keao.edu.im.job.ScheduleManager;
 import com.keao.edu.im.mec.im.IMHelper;
-import com.keao.edu.im.mec.im.message.ApplyForSpeechMessage;
-import com.keao.edu.im.mec.im.message.AssistantTransferMessage;
-import com.keao.edu.im.mec.im.message.ControlDeviceNotifyMessage;
-import com.keao.edu.im.mec.im.message.DeviceStateChangedMessage;
-import com.keao.edu.im.mec.im.message.DisplayMessage;
-import com.keao.edu.im.mec.im.message.MemberChangedMessage;
-import com.keao.edu.im.mec.im.message.RoleChangedMessage;
-import com.keao.edu.im.mec.im.message.SpeechResultMessage;
-import com.keao.edu.im.mec.im.message.TurnPageMessage;
-import com.keao.edu.im.mec.im.message.UpgradeRoleMessage;
-import com.keao.edu.im.mec.im.message.WhiteboardMessage;
-import com.keao.edu.im.pojo.ActionEnum;
-import com.keao.edu.im.pojo.ControlDeviceTaskInfo;
-import com.keao.edu.im.pojo.CustomMessage;
-import com.keao.edu.im.pojo.DeviceTypeEnum;
-import com.keao.edu.im.pojo.IMApiResultInfo;
-import com.keao.edu.im.pojo.PlayMidiMessageData;
-import com.keao.edu.im.pojo.ReqChangeUserRoleData;
-import com.keao.edu.im.pojo.ReqDeviceControlData;
-import com.keao.edu.im.pojo.ReqMemberOnlineStatus;
-import com.keao.edu.im.pojo.RoleEnum;
-import com.keao.edu.im.pojo.Room;
-import com.keao.edu.im.pojo.RoomMember;
-import com.keao.edu.im.pojo.RoomResult;
-import com.keao.edu.im.pojo.ScheduledTaskInfo;
-import com.keao.edu.im.pojo.UpgradeRoleTaskInfo;
-import com.keao.edu.im.pojo.UserInfo;
-import com.keao.edu.im.pojo.WhiteBoardApiResultInfo;
-import com.keao.edu.im.pojo.Whiteboard;
+import com.keao.edu.im.mec.im.message.*;
+import com.keao.edu.im.pojo.*;
 import com.keao.edu.im.service.MessageService;
 import com.keao.edu.im.service.RoomService;
 import com.keao.edu.im.utils.CheckUtils;
 import com.keao.edu.im.utils.CodeUtil;
 import com.keao.edu.im.utils.DateTimeUtils;
 import com.keao.edu.im.utils.IdentifierUtils;
+import com.keao.edu.im.whiteboard.WhiteBoardHelper;
+import io.rong.models.message.GroupMessage;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * Created by super_zou on 2019/11/28.
@@ -108,9 +77,6 @@ public class RoomServiceImpl implements RoomService {
     @Autowired
     private SysUserFeignService sysUserFeignService;
 
-    @Value("${auth.sysconfig.tenantId}")
-    private Integer lesseeOrganId;
-
     @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
     @Override
     public RoomResult joinRoom(String userName, String roomId, boolean isAudience, boolean isDisableCamera,boolean isMusicMode) throws ApiException, Exception {

edu-im/edu-im-server/src/main/java/com/keao/edu/im/whiteboard/WhiteBoardHelper.java

@@ -20,7 +20,6 @@ public class WhiteBoardHelper {
 
     @Autowired
     HttpHelper httpHelper;
-
     @Autowired
     WhiteBoardProperties whiteBoardProperties;
     @Autowired

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

@@ -111,9 +111,5 @@ cn:
       roomTtl: 7200000
       userIMOfflineKickTtl: 300000
 
-auth:
-  sysconfig:
-    tenantId: 1
-
 message:
   debugMode: true