shangke 2 anni fa
parent
commit
d27914d872

+ 2 - 1
.gitignore

@@ -38,4 +38,5 @@ mvnw.cmd
 **/logback-test.xml
 
 /bin/
-**/logback-spring.xml
+**/logback-spring.xml
+**/*.log

+ 1 - 1
mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/handler/BaseAuthenticationSuccessEventHandler.java

@@ -159,7 +159,7 @@ public class BaseAuthenticationSuccessEventHandler extends SavedRequestAwareAuth
 			if (clientId.toUpperCase().equals(SysUserType.EDUCATION.getCode())) {
 
 				String collect = Arrays.stream(sysUser.getUserType().split(","))
-						.filter(x -> x.equals(SysUserType.EDUCATION.getCode()) || x.equals(SysUserType.SCHOOL.getCode()))
+						.filter(x -> x.equals(SysUserType.SYSTEM.getCode()) || x.equals(SysUserType.SCHOOL.getCode()))
 						.collect(Collectors.joining(","));
 				// 登录客户端类型
 				map.put("clientType", collect);

+ 1 - 1
mec-common/common-core/pom.xml

@@ -64,7 +64,7 @@
 		<dependency>
 			<groupId>org.springframework.security.oauth</groupId>
 			<artifactId>spring-security-oauth2</artifactId>
-			<version>2.2.1.RELEASE</version>
+			<version>2.3.3.RELEASE</version>
 		</dependency>
 
 		<dependency>