Update spring2.1.7

.gitignore

@@ -36,3 +36,6 @@ imooc-security-authorize/.classpath
 *.classpath
 *.factorypath
 imooc-security/.settings/org.eclipse.m2e.core.prefs
+
+**/.idea/**
+**/*.iml

imooc-security-app/src/main/java/com/imooc/security/app/authentication/ImoocAuthenticationSuccessHandler.java

@@ -16,7 +16,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.crypto.codec.Base64;
+import java.util.Base64;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
 import org.springframework.security.oauth2.common.exceptions.UnapprovedClientAuthenticationException;
 import org.springframework.security.oauth2.provider.ClientDetails;
@@ -103,7 +103,7 @@ private String[] extractAndDecodeHeader(String header, HttpServletRequest reques
 		byte[] base64Token = header.substring(6).getBytes("UTF-8");
 		byte[] decoded;
 		try {
-			decoded = Base64.decode(base64Token);
+			decoded = Base64.getDecoder().decode(base64Token);
 		} catch (IllegalArgumentException e) {
 			throw new BadCredentialsException("Failed to decode basic authentication token");
 		}

imooc-security-authorize/src/main/java/com/imooc/security/rbac/dto/AdminInfo.java

@@ -3,7 +3,7 @@
  */
 package com.imooc.security.rbac.dto;
 
-import org.hibernate.validator.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
 
 /**
  * @author zhailiang

imooc-security-authorize/src/main/java/com/imooc/security/rbac/service/impl/AdminServiceImpl.java

@@ -66,7 +66,7 @@ public AdminInfo create(AdminInfo adminInfo) {
 	@Override
 	public AdminInfo update(AdminInfo adminInfo) {
 
-		Admin admin = adminRepository.findOne(adminInfo.getId());
+		Admin admin = adminRepository.findById(adminInfo.getId()).orElse(null);
 		BeanUtils.copyProperties(adminInfo, admin);
 
 		createRoleAdmin(adminInfo, admin);
@@ -81,7 +81,7 @@ public AdminInfo update(AdminInfo adminInfo) {
 	 */
 	private void createRoleAdmin(AdminInfo adminInfo, Admin admin) {
 		if(CollectionUtils.isNotEmpty(admin.getRoles())){
-			roleAdminRepository.delete(admin.getRoles());
+			roleAdminRepository.deleteAll(admin.getRoles());
 		}
 		RoleAdmin roleAdmin = new RoleAdmin();
 		roleAdmin.setRole(roleRepository.getOne(adminInfo.getRoleId()));
@@ -94,15 +94,15 @@ private void createRoleAdmin(AdminInfo adminInfo, Admin admin) {
 	 */
 	@Override
 	public void delete(Long id) {
-		adminRepository.delete(id);
+		adminRepository.deleteById(id);
 	}
 
 	/* (non-Javadoc)
 	 * @see com.imooc.security.rbac.service.AdminService#getInfo(java.lang.Long)
 	 */
 	@Override
 	public AdminInfo getInfo(Long id) {
-		Admin admin = adminRepository.findOne(id);
+		Admin admin = adminRepository.findById(id).orElse(null);
 		AdminInfo info = new AdminInfo();
 		BeanUtils.copyProperties(admin, info);
 		return info;

imooc-security-authorize/src/main/java/com/imooc/security/rbac/service/impl/ResourceServiceImpl.java

@@ -35,7 +35,7 @@ public class ResourceServiceImpl implements ResourceService {
 	 */
 	@Override
 	public ResourceInfo getTree(Long adminId) {
-		Admin admin = adminRepository.findOne(adminId);
+		Admin admin = adminRepository.findById(adminId).orElse(null);
 		return resourceRepository.findByName("根节点").toTree(admin);
 	}
 
@@ -44,15 +44,15 @@ public ResourceInfo getTree(Long adminId) {
 	 */
 	@Override
 	public ResourceInfo getInfo(Long id) {
-		Resource resource = resourceRepository.findOne(id);
+		Resource resource = resourceRepository.findById(id).orElse(null);
 		ResourceInfo resourceInfo = new ResourceInfo();
 		BeanUtils.copyProperties(resource, resourceInfo);
 		return resourceInfo;
 	}
 
 	@Override
 	public ResourceInfo create(ResourceInfo info) {
-		Resource parent = resourceRepository.findOne(info.getParentId());
+		Resource parent = resourceRepository.findById(info.getParentId()).orElse(null);
 		if(parent == null){
 			parent = resourceRepository.findByName("根节点");
 		}
@@ -65,21 +65,21 @@ public ResourceInfo create(ResourceInfo info) {
 
 	@Override
 	public ResourceInfo update(ResourceInfo info) {
-		Resource resource = resourceRepository.findOne(info.getId());
+		Resource resource = resourceRepository.findById(info.getId()).orElse(null);
 		BeanUtils.copyProperties(info, resource);
 		return info;
 	}
 
 	@Override
 	public void delete(Long id) {
-		resourceRepository.delete(id);
+		resourceRepository.deleteById(id);
 	}
 	/* (non-Javadoc)
 	 * @see com.imooc.security.rbac.service.ResourceService#move(java.lang.Long, boolean)
 	 */
 	@Override
 	public Long move(Long id, boolean up) {
-		Resource resource = resourceRepository.findOne(id);
+		Resource resource = resourceRepository.findById(id).orElse(null);
 		int index = resource.getSort();
 		List<Resource> childs = resource.getParent().getChilds();
 		for (int i = 0; i < childs.size(); i++) {

imooc-security-authorize/src/main/java/com/imooc/security/rbac/service/impl/RoleServiceImpl.java

@@ -57,7 +57,7 @@ public RoleInfo create(RoleInfo info) {
 	 */
 	@Override
 	public RoleInfo update(RoleInfo info) {
-		Role role = roleRepository.findOne(info.getId());
+		Role role = roleRepository.findById(info.getId()).orElse(null);
 		BeanUtils.copyProperties(info, role);
 		return info;
 	}
@@ -68,11 +68,11 @@ public RoleInfo update(RoleInfo info) {
 	 */
 	@Override
 	public void delete(Long id) {
-		Role role = roleRepository.findOne(id);
+		Role role = roleRepository.findById(id).orElse(null);
 		if(CollectionUtils.isNotEmpty(role.getAdmins())){
 			throw new RuntimeException("不能删除有下挂用户的角色");
 		}
-		roleRepository.delete(id);		
+		roleRepository.deleteById(id);
 	}
 //
 //	@Override
@@ -96,7 +96,7 @@ public void delete(Long id) {
 	 */
 	@Override
 	public RoleInfo getInfo(Long id) {
-		Role role = roleRepository.findOne(id);
+		Role role = roleRepository.findById(id).orElse(null);
 		RoleInfo info = new RoleInfo();
 		BeanUtils.copyProperties(role, info);
 		return info;
@@ -112,7 +112,7 @@ public List<RoleInfo> findAll() {
 
 	@Override
 	public String[] getRoleResources(Long id) {
-		Role role = roleRepository.findOne(id);
+		Role role = roleRepository.findById(id).orElse(null);
 		Set<String> resourceIds = new HashSet<>();
 		for (RoleResource resource : role.getResources()) {
 			resourceIds.add(resource.getResource().getId().toString());
@@ -127,8 +127,8 @@ public String[] getRoleResources(Long id) {
 	@Override
 	public void setRoleResources(Long roleId, String resourceIds) {
 		resourceIds = StringUtils.removeEnd(resourceIds, ",");
-		Role role = roleRepository.findOne(roleId);
-		roleResourceRepository.delete(role.getResources());
+		Role role = roleRepository.findById(roleId).orElse(null);
+		roleResourceRepository.deleteAll(role.getResources());
 		String[] resourceIdArray = StringUtils.splitByWholeSeparatorPreserveAllTokens(resourceIds, ",");
 		for (String resourceId : resourceIdArray) {
 			RoleResource roleResource = new RoleResource();

imooc-security-browser/pom.xml

@@ -17,7 +17,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.session</groupId>
-			<artifactId>spring-session</artifactId>
+			<artifactId>spring-session-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.session</groupId>
+			<artifactId>spring-session-data-redis</artifactId>
 		</dependency>
 	</dependencies>
 

imooc-security-browser/src/main/java/com/imooc/security/browser/authentication/ImoocAuthenticationSuccessHandler.java

@@ -42,12 +42,11 @@ public class ImoocAuthenticationSuccessHandler extends SavedRequestAwareAuthenti
 
 	private RequestCache requestCache = new HttpSessionRequestCache();
 
-	/*
+	/**
 	 * (non-Javadoc)
 	 * 
-	 * @see org.springframework.security.web.authentication.
-	 * AuthenticationSuccessHandler#onAuthenticationSuccess(javax.servlet.http.
-	 * HttpServletRequest, javax.servlet.http.HttpServletResponse,
+	 * @see org.springframework.security.web.authentication.AuthenticationSuccessHandler
+	 * 	onAuthenticationSuccess(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse,
 	 * org.springframework.security.core.Authentication)
 	 */
 	@Override

imooc-security-core/pom.xml

@@ -10,6 +10,10 @@
 	</parent>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-oauth2</artifactId>
@@ -25,38 +29,66 @@
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
+			<version>8.0.16</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.social</groupId>
 			<artifactId>spring-social-config</artifactId>
+			<version>2.0.0.M4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.social</groupId>
 			<artifactId>spring-social-core</artifactId>
+			<version>2.0.0.M4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.social</groupId>
 			<artifactId>spring-social-security</artifactId>
+			<version>2.0.0.M4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.social</groupId>
 			<artifactId>spring-social-web</artifactId>
+			<version>2.0.0.M4</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>
+			<version>2.6</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-collections</groupId>
 			<artifactId>commons-collections</artifactId>
+			<version>3.2.2</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-beanutils</groupId>
 			<artifactId>commons-beanutils</artifactId>
+			<version>1.9.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-configuration-processor</artifactId>
 		</dependency>
 	</dependencies>
+
+	<repositories>
+		<repository>
+			<id>spring-snapshots</id>
+			<name>Spring Snapshots</name>
+			<url>https://repo.spring.io/snapshot</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>https://repo.spring.io/milestone</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+
 </project>

imooc-security-core/src/main/java/com/imooc/security/core/properties/QQProperties.java

@@ -3,7 +3,6 @@
  */
 package com.imooc.security.core.properties;
 
-import org.springframework.boot.autoconfigure.social.SocialProperties;
 
 /**
  * QQ登录配置项
@@ -12,19 +11,37 @@
  * @author zhailiang
  *
  */
-public class QQProperties extends SocialProperties {
+public class QQProperties {
 
 	/**
 	 * 第三方id，用来决定发起第三方登录的url，默认是 qq。
 	 */
 	private String providerId = "qq";
 
+	private String appId;
+	private String appSecret;
+
 	public String getProviderId() {
 		return providerId;
 	}
 
 	public void setProviderId(String providerId) {
 		this.providerId = providerId;
 	}
-
+
+	public String getAppId() {
+		return appId;
+	}
+
+	public void setAppId(String appId) {
+		this.appId = appId;
+	}
+
+	public String getAppSecret() {
+		return appSecret;
+	}
+
+	public void setAppSecret(String appSecret) {
+		this.appSecret = appSecret;
+	}
 }

imooc-security-core/src/main/java/com/imooc/security/core/properties/WeixinProperties.java

@@ -3,21 +3,22 @@
  */
 package com.imooc.security.core.properties;
 
-import org.springframework.boot.autoconfigure.social.SocialProperties;
-
 /**
  * 微信登录配置项
  * 
  * @author zhailiang
  *
  */
-public class WeixinProperties extends SocialProperties {
+public class WeixinProperties{
 
 	/**
 	 * 第三方id，用来决定发起第三方登录的url，默认是 weixin。
 	 */
 	private String providerId = "weixin";
 
+	private String appId;
+	private String appSecret;
+
 	/**
 	 * @return the providerId
 	 */
@@ -31,6 +32,20 @@ public String getProviderId() {
 	public void setProviderId(String providerId) {
 		this.providerId = providerId;
 	}
-
 
+	public String getAppId() {
+		return appId;
+	}
+
+	public void setAppId(String appId) {
+		this.appId = appId;
+	}
+
+	public String getAppSecret() {
+		return appSecret;
+	}
+
+	public void setAppSecret(String appSecret) {
+		this.appSecret = appSecret;
+	}
 }