package refactoring

jinkaz · Apr 18, 2018 · b71ac1c · b71ac1c
1 parent 067f185
commit b71ac1c
Show file tree

Hide file tree

Showing 46 changed files with 105 additions and 428 deletions.
diff --git a/lab05/README.md b/lab05/README.md
@@ -5,4 +5,11 @@
 
 [源码](https://github.com/Baeldung/spring-security-oauth)
 
-
+### 实验步骤
+1. 需要启动mysql数据库，在oauth-server/src/main/resources/persistence.properties设置数据库访问用户名/密码
+2. 依次启动：
+ * 授权服务器oauth-server(8081)
+ * 资源服务器oauth-resource(8082)
+ * AngularJS单页应用oauth-ui-implicit(0803)
+3. 浏览器打开http://localhost:8083 开始实验
+4. 登录用户名密码在oauth-server/.../WebSecurityConfig中配置 
diff --git a/lab05/angularjs/oauth-ui-implicit/.springBeans b/lab05/angularjs/oauth-ui-implicit/.springBeans
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+	<version>1</version>
+	<pluginVersion><![CDATA[3.9.2.201712210913-RELEASE]]></pluginVersion>
+	<configSuffixes>
+		<configSuffix><![CDATA[xml]]></configSuffix>
+	</configSuffixes>
+	<enableImports><![CDATA[false]]></enableImports>
+	<configs>
+		<config>java:io.spring2go.config.UiApplication</config>
+	</configs>
+	<autoconfigs>
+	</autoconfigs>
+	<configSets>
+	</configSets>
+</beansProjectDescription>
diff --git a/...spring-security-oauth-ui-implicit/pom.xml → lab05/angularjs/oauth-ui-implicit/pom.xml b/...spring-security-oauth-ui-implicit/pom.xml → lab05/angularjs/oauth-ui-implicit/pom.xml
@@ -1,12 +1,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>spring-security-oauth-ui-implicit</artifactId>
+    <artifactId>oauth-ui-implicit</artifactId>
 
-    <name>spring-security-oauth-ui-implicit</name>
+    <name>oauth-ui-implicit</name>
     <packaging>war</packaging>
 
     <parent>
-        <groupId>org.baeldung</groupId>
+        <groupId>io.spring2go</groupId>
         <artifactId>spring-security-oauth</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../</relativePath>        
@@ -56,7 +56,7 @@
     </dependencies>
 
     <build>
-        <finalName>spring-security-oauth-ui-implicit</finalName>
+        <finalName>oauth-ui-implicit</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>

diff --git a/...va/org/baeldung/config/UiApplication.java → ...va/io/spring2go/config/UiApplication.java b/...va/org/baeldung/config/UiApplication.java → ...va/io/spring2go/config/UiApplication.java
@@ -1,4 +1,4 @@
-package org.baeldung.config;
+package io.spring2go.config;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

diff --git a/...java/org/baeldung/config/UiWebConfig.java → ...java/io/spring2go/config/UiWebConfig.java b/...java/org/baeldung/config/UiWebConfig.java → ...java/io/spring2go/config/UiWebConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.config;
+package io.spring2go.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

diff --git a/...src/main/resources/application.properties → ...src/main/resources/application.properties b/...src/main/resources/application.properties → ...src/main/resources/application.properties
diff --git a/...i-implicit/src/main/resources/oauth-ng.js → ...i-implicit/src/main/resources/oauth-ng.js b/...i-implicit/src/main/resources/oauth-ng.js → ...i-implicit/src/main/resources/oauth-ng.js
diff --git a/.../src/main/resources/templates/header.html → .../src/main/resources/templates/header.html b/.../src/main/resources/templates/header.html → .../src/main/resources/templates/header.html
@@ -10,7 +10,7 @@
 
 
 <oauth
-  site="http://localhost:8081/spring-security-oauth-server"
+  site="http://localhost:8081"
   client-id="sampleClientId"
   redirect-uri="http://localhost:8083/"
   scope="read write foo bar"
@@ -57,7 +57,7 @@
 	});
 
 	$scope.foo = {id:0 , name:"sample foo"};
-    $scope.foos = $resource("http://localhost:8082/spring-security-oauth-resource/foos/:fooId",{fooId:'@id'});
+    $scope.foos = $resource("http://localhost:8082/foos/:fooId",{fooId:'@id'});
 
 	$scope.getFoo = function(){
 		$scope.foo = $scope.foos.get({fooId:$scope.foo.id});
@@ -77,7 +77,7 @@
 
 	// bar
 	$scope.bar = {id:0 , name:"sample bar"};
-    $scope.bars = $resource("http://localhost:8082/spring-security-oauth-resource/bars/:barId",{barId:'@id'});
+    $scope.bars = $resource("http://localhost:8082/bars/:barId",{barId:'@id'});
 
     $scope.getBar = function(){
         $scope.bar = $scope.bars.get({barId:$scope.bar.id});
@@ -95,8 +95,8 @@
         });
     }
 
-    $scope.revokeToken = $resource("http://localhost:8081/spring-security-oauth-server/oauth/token/revokeById/:tokenId",{tokenId:'@tokenId'});
-    $scope.tokens = $resource("http://localhost:8081/spring-security-oauth-server/tokens");
+    $scope.revokeToken = $resource("http://localhost:8081/oauth/token/revokeById/:tokenId",{tokenId:'@tokenId'});
+    $scope.tokens = $resource("http://localhost:8081/tokens");
 
     $scope.getTokens = function(){
         $scope.tokenList = $scope.tokens.query();	

diff --git a/...t/src/main/resources/templates/index.html → ...t/src/main/resources/templates/index.html b/...t/src/main/resources/templates/index.html → ...t/src/main/resources/templates/index.html
diff --git a/...c/main/resources/templates/oauthTemp.html → ...c/main/resources/templates/oauthTemp.html b/...c/main/resources/templates/oauthTemp.html → ...c/main/resources/templates/oauthTemp.html
diff --git a/...cit/src/main/webapp/resources/oauth-ng.js → ...cit/src/main/webapp/resources/oauth-ng.js b/...cit/src/main/webapp/resources/oauth-ng.js → ...cit/src/main/webapp/resources/oauth-ng.js
diff --git a/.../spring-security-oauth-ui-implicit/src/test/java/org/baeldung/test/UiIntegrationTest.java b/.../spring-security-oauth-ui-implicit/src/test/java/org/baeldung/test/UiIntegrationTest.java
diff --git a/lab05/oauth-resource/.springBeans b/lab05/oauth-resource/.springBeans
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+	<version>1</version>
+	<pluginVersion><![CDATA[3.9.2.201712210913-RELEASE]]></pluginVersion>
+	<configSuffixes>
+		<configSuffix><![CDATA[xml]]></configSuffix>
+	</configSuffixes>
+	<enableImports><![CDATA[false]]></enableImports>
+	<configs>
+		<config>java:io.spring2go.config.ResourceServerApplication</config>
+	</configs>
+	<autoconfigs>
+	</autoconfigs>
+	<configSets>
+	</configSets>
+</beansProjectDescription>
diff --git a/lab05/spring-security-oauth-resource/pom.xml → lab05/oauth-resource/pom.xml b/lab05/spring-security-oauth-resource/pom.xml → lab05/oauth-resource/pom.xml
@@ -1,12 +1,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>spring-security-oauth-resource</artifactId>
-	<name>spring-security-oauth-resource</name>
+	<artifactId>oauth-resource</artifactId>
+	<name>oauth-resource</name>
 	<packaging>war</packaging>
 
 	<parent>
-		<groupId>org.baeldung</groupId>
+		<groupId>io.spring2go</groupId>
 		<artifactId>spring-security-oauth</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
@@ -45,11 +45,6 @@
 			<artifactId>spring-security-oauth2</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-jwt</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
@@ -95,7 +90,7 @@
 	</dependencies>
 
 	<build>
-		<finalName>spring-security-oauth-resource</finalName>
+		<finalName>oauth-resource</finalName>
 		<resources>
 			<resource>
 				<directory>src/main/resources</directory>

diff --git a/.../java/org/baeldung/config/CorsFilter.java → .../java/io/spring2go/config/CorsFilter.java b/.../java/org/baeldung/config/CorsFilter.java → .../java/io/spring2go/config/CorsFilter.java
@@ -1,4 +1,4 @@
-package org.baeldung.config;
+package io.spring2go.config;
 
 import java.io.IOException;
 

diff --git a/...baeldung/config/MethodSecurityConfig.java → ...pring2go/config/MethodSecurityConfig.java b/...baeldung/config/MethodSecurityConfig.java → ...pring2go/config/MethodSecurityConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.config;
+package io.spring2go.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler;

diff --git a/...sourceServerConfigRemoteTokenService.java → ...sourceServerConfigRemoteTokenService.java b/...sourceServerConfigRemoteTokenService.java → ...sourceServerConfigRemoteTokenService.java
@@ -1,4 +1,4 @@
-package org.baeldung.config;
+package io.spring2go.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -26,7 +26,7 @@ public void configure(final HttpSecurity http) throws Exception {
     @Bean
     public RemoteTokenServices tokenServices() {
         final RemoteTokenServices tokenService = new RemoteTokenServices();
-        tokenService.setCheckTokenEndpointUrl("http://localhost:8081/spring-security-oauth-server/oauth/check_token");
+        tokenService.setCheckTokenEndpointUrl("http://localhost:8081/oauth/check_token");
         tokenService.setClientId("fooClientIdPassword");
         tokenService.setClientSecret("secret");
         return tokenService;

diff --git a/...ung/config/ResourceServerApplication.java → ...2go/config/ResourceServerApplication.java b/...ung/config/ResourceServerApplication.java → ...2go/config/ResourceServerApplication.java
@@ -1,4 +1,4 @@
-package org.baeldung.config;
+package io.spring2go.config;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

diff --git a/...ldung/config/ResourceServerWebConfig.java → ...ng2go/config/ResourceServerWebConfig.java b/...ldung/config/ResourceServerWebConfig.java → ...ng2go/config/ResourceServerWebConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.config;
+package io.spring2go.config;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -7,7 +7,7 @@
 
 @Configuration
 @EnableWebMvc
-@ComponentScan({ "org.baeldung.web.controller" })
+@ComponentScan({ "io.spring2go.web.controller" })
 public class ResourceServerWebConfig extends WebMvcConfigurerAdapter {
     //
 }
diff --git a/...aeldung/web/controller/BarController.java → ...ring2go/web/controller/BarController.java b/...aeldung/web/controller/BarController.java → ...ring2go/web/controller/BarController.java
@@ -1,9 +1,8 @@
-package org.baeldung.web.controller;
+package io.spring2go.web.controller;
 
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 import static org.apache.commons.lang3.RandomStringUtils.randomNumeric;
 
-import org.baeldung.web.dto.Bar;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
@@ -14,6 +13,8 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
+import io.spring2go.web.dto.Bar;
+
 @Controller
 public class BarController {
 

diff --git a/...aeldung/web/controller/FooController.java → ...ring2go/web/controller/FooController.java b/...aeldung/web/controller/FooController.java → ...ring2go/web/controller/FooController.java
@@ -1,9 +1,8 @@
-package org.baeldung.web.controller;
+package io.spring2go.web.controller;
 
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 import static org.apache.commons.lang3.RandomStringUtils.randomNumeric;
 
-import org.baeldung.web.dto.Foo;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
@@ -14,6 +13,8 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
+import io.spring2go.web.dto.Foo;
+
 @Controller
 public class FooController {
 

diff --git a/...c/main/java/org/baeldung/web/dto/Bar.java → ...c/main/java/io/spring2go/web/dto/Bar.java b/...c/main/java/org/baeldung/web/dto/Bar.java → ...c/main/java/io/spring2go/web/dto/Bar.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.dto;
+package io.spring2go.web.dto;
 
 public class Bar {
     private long id;

diff --git a/...c/main/java/org/baeldung/web/dto/Foo.java → ...c/main/java/io/spring2go/web/dto/Foo.java b/...c/main/java/org/baeldung/web/dto/Foo.java → ...c/main/java/io/spring2go/web/dto/Foo.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.dto;
+package io.spring2go.web.dto;
 
 public class Foo {
     private long id;

diff --git a/...src/main/resources/application.properties → ...src/main/resources/application.properties b/...src/main/resources/application.properties → ...src/main/resources/application.properties
@@ -1,4 +1,3 @@
-server.contextPath=/spring-security-oauth-resource
 server.port=8082
 logging.level.org=INFO
 #endpoints.cors.allowed-origins=*
diff --git a/lab05/oauth-server/.springBeans b/lab05/oauth-server/.springBeans
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+	<version>1</version>
+	<pluginVersion><![CDATA[3.9.2.201712210913-RELEASE]]></pluginVersion>
+	<configSuffixes>
+		<configSuffix><![CDATA[xml]]></configSuffix>
+	</configSuffixes>
+	<enableImports><![CDATA[false]]></enableImports>
+	<configs>
+		<config>java:io.spring2go.config.AuthorizationServerApplication</config>
+	</configs>
+	<autoconfigs>
+	</autoconfigs>
+	<configSets>
+	</configSets>
+</beansProjectDescription>
diff --git a/lab05/spring-security-oauth-server/pom.xml → lab05/oauth-server/pom.xml b/lab05/spring-security-oauth-server/pom.xml → lab05/oauth-server/pom.xml
@@ -1,13 +1,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>spring-security-oauth-server</artifactId>
+	<artifactId>oauth-server</artifactId>
 
-	<name>spring-security-oauth-server</name>
+	<name>oauth-server</name>
 	<packaging>war</packaging>
 
 	<parent>
-		<groupId>org.baeldung</groupId>
+		<groupId>io.spring2go</groupId>
 		<artifactId>spring-security-oauth</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
@@ -47,11 +47,6 @@
 			<artifactId>spring-security-oauth2</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-jwt</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
@@ -94,7 +89,7 @@
 	</dependencies>
 
 	<build>
-		<finalName>spring-security-oauth-server</finalName>
+		<finalName>oauth-server</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
@@ -165,7 +160,7 @@
 
 	<properties>
 		<!-- The main class to start by executing java -jar -->
-		<start-class>org.baeldung.config.AuthorizationServerApplication</start-class>
+		<start-class>io.spring2go.AuthorizationServerApplication</start-class>
 	</properties>
 	<!-- <profiles> <profile> <id>dev</id> <build> <resources> <resource> <directory>src/main/resources</directory> 
 		<filtering>true</filtering> <excludes> <exclude>*.jks</exclude> </excludes> 

diff --git a/...onfig/AuthorizationServerApplication.java → ...onfig/AuthorizationServerApplication.java b/...onfig/AuthorizationServerApplication.java → ...onfig/AuthorizationServerApplication.java
@@ -1,4 +1,4 @@
-package org.baeldung.config;
+package io.spring2go.config;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

diff --git a/.../java/org/baeldung/config/CorsFilter.java → .../java/io/spring2go/config/CorsFilter.java b/.../java/org/baeldung/config/CorsFilter.java → .../java/io/spring2go/config/CorsFilter.java
@@ -1,4 +1,4 @@
-package org.baeldung.config;
+package io.spring2go.config;
 
 import java.io.IOException;
 

diff --git a/.../baeldung/config/CustomTokenEnhancer.java → ...spring2go/config/CustomTokenEnhancer.java b/.../baeldung/config/CustomTokenEnhancer.java → ...spring2go/config/CustomTokenEnhancer.java
@@ -1,4 +1,4 @@
-package org.baeldung.config;
+package io.spring2go.config;
 
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 

diff --git a/...nfig/OAuth2AuthorizationServerConfig.java → ...nfig/OAuth2AuthorizationServerConfig.java b/...nfig/OAuth2AuthorizationServerConfig.java → ...nfig/OAuth2AuthorizationServerConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.config;
+package io.spring2go.config;
 
 import java.util.Arrays;
 

diff --git a/.../baeldung/config/RevokeTokenEndpoint.java → ...spring2go/config/RevokeTokenEndpoint.java b/.../baeldung/config/RevokeTokenEndpoint.java → ...spring2go/config/RevokeTokenEndpoint.java
@@ -1,4 +1,4 @@
-package org.baeldung.config;
+package io.spring2go.config;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;

diff --git a/.../org/baeldung/config/TokenController.java → .../io/spring2go/config/TokenController.java b/.../org/baeldung/config/TokenController.java → .../io/spring2go/config/TokenController.java
@@ -1,4 +1,4 @@
-package org.baeldung.config;
+package io.spring2go.config;
 
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/...rg/baeldung/config/WebSecurityConfig.java → ...o/spring2go/config/WebSecurityConfig.java b/...rg/baeldung/config/WebSecurityConfig.java → ...o/spring2go/config/WebSecurityConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.config;
+package io.spring2go.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.security.SecurityProperties;

diff --git a/lab05/oauth-server/src/main/resources/application.properties b/lab05/oauth-server/src/main/resources/application.properties
@@ -0,0 +1,3 @@
+server.port=8081
+
+#spring.profiles.active=dev
diff --git a/...-oauth-server/src/main/resources/data.sql → .../oauth-server/src/main/resources/data.sql b/...-oauth-server/src/main/resources/data.sql → .../oauth-server/src/main/resources/data.sql
diff --git a/...src/main/resources/persistence.properties → ...src/main/resources/persistence.properties b/...src/main/resources/persistence.properties → ...src/main/resources/persistence.properties
diff --git a/...auth-server/src/main/resources/schema.sql → ...auth-server/src/main/resources/schema.sql b/...auth-server/src/main/resources/schema.sql → ...auth-server/src/main/resources/schema.sql