zouxuan 5 years ago
parent
commit
f22faf4354

+ 0 - 6
mec-auth/mec-auth-server/pom.xml

@@ -30,12 +30,6 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.springframework.social</groupId>
-			<artifactId>spring-social-core</artifactId>
-		</dependency>
-
-
-		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-security</artifactId>
 		</dependency>

+ 1 - 2
mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/config/AuthorizationServerConfig.java

@@ -1,7 +1,6 @@
 package com.ym.mec.auth.config;
 
 import com.ym.mec.common.constant.CommonConstants;
-import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -15,13 +14,13 @@ import org.springframework.security.oauth2.config.annotation.web.configurers.Aut
 import org.springframework.security.oauth2.provider.client.JdbcClientDetailsService;
 import org.springframework.security.oauth2.provider.token.DefaultTokenServices;
 import org.springframework.security.oauth2.provider.token.store.redis.RedisTokenStore;
+
 import javax.sql.DataSource;
 
 /**
  * 授权服务器配置
  */
 @Configuration
-@AllArgsConstructor
 @EnableAuthorizationServer
 public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdapter {
 

+ 3 - 0
mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/config/provider/service/BaseUserDetailsService.java

@@ -35,6 +35,9 @@ public class BaseUserDetailsService implements UserDetailsService {
 		}
 
 		SysUserInfo userInfo = sysUserService.queryUserInfoByUsername(username);
+		if(userInfo == null){
+			return null;
+		}
 
 		List<GrantedAuthority> authorities = AuthorityUtils.createAuthorityList(userInfo.getPermissions());
 

+ 0 - 10
pom.xml

@@ -117,10 +117,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-		</dependency>
 		
 		<!--集群监控消息队列 -->
 		<!-- <dependency>
@@ -137,12 +133,6 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-bus-amqp</artifactId>
 		</dependency> -->
-		<!--使用 lombok 简化 Java 代码 -->
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<scope>compile</scope>
-		</dependency>
 		<!--热加载 -->
 		<!-- <dependency>
 			<groupId>org.springframework.boot</groupId>