diff --git a/.run/BorrowApplication.run.xml b/.run/BorrowApplication.run.xml new file mode 100644 index 0000000..4b473fd --- /dev/null +++ b/.run/BorrowApplication.run.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/.run/Nacos.run.xml b/.run/Nacos.run.xml new file mode 100644 index 0000000..fe5be06 --- /dev/null +++ b/.run/Nacos.run.xml @@ -0,0 +1,17 @@ + + + + \ No newline at end of file diff --git a/.run/UserApplication.run.xml b/.run/UserApplication.run.xml new file mode 100644 index 0000000..02f1cc3 --- /dev/null +++ b/.run/UserApplication.run.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/auth-service/src/main/resources/application.yml b/auth-service/src/main/resources/application.yml index d4860ca..87aa64f 100644 --- a/auth-service/src/main/resources/application.yml +++ b/auth-service/src/main/resources/application.yml @@ -5,3 +5,6 @@ server: #这里修改一下context-path，这样保存的Cookie会使用指定的路径，就不会和其他服务打架了 #但是注意之后的请求都得在最前面加上这个路径 context-path: /sso +spring: + application: + name: authservice diff --git a/book-service/src/main/java/com/test/BookApplication.java b/book-service/src/main/java/com/test/BookApplication.java index 467ea43..f33ef6b 100644 --- a/book-service/src/main/java/com/test/BookApplication.java +++ b/book-service/src/main/java/com/test/BookApplication.java @@ -2,7 +2,6 @@ package com.test; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.security.oauth2.client.EnableOAuth2Sso; import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer; /** diff --git a/book-service/src/main/java/com/test/config/ResourceConfiguration.java b/book-service/src/main/java/com/test/config/ResourceConfiguration.java index 1043f29..326ae4c 100644 --- a/book-service/src/main/java/com/test/config/ResourceConfiguration.java +++ b/book-service/src/main/java/com/test/config/ResourceConfiguration.java @@ -5,11 +5,11 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter; /** - * ClassName: con + * ClassName: cong * Package: com.test.config * * @author yovinchen - * @Create 2023/8/21 10:23 + * @Create 2023/8/21 20:10 */ @Configuration public class ResourceConfiguration extends ResourceServerConfigurerAdapter { //继承此类进行高度自定义 @@ -18,7 +18,7 @@ public class ResourceConfiguration extends ResourceServerConfigurerAdapter { // public void configure(HttpSecurity http) throws Exception { //这里也有HttpSecurity对象，方便我们配置SpringSecurity http .authorizeRequests() - .anyRequest().access("#oauth2.hasScope('lbwnb')"); //添加自定义规则 + .anyRequest().access("#oauth2.hasScope('book')"); //添加自定义规则 //Token必须要有我们自定义scope授权才可以访问此资源 } } diff --git a/book-service/src/main/java/com/test/service/impl/BookServiceImpl.java b/book-service/src/main/java/com/test/service/impl/BookServiceImpl.java index a595169..0f1237f 100644 --- a/book-service/src/main/java/com/test/service/impl/BookServiceImpl.java +++ b/book-service/src/main/java/com/test/service/impl/BookServiceImpl.java @@ -1,11 +1,11 @@ package com.test.service.impl; +import com.test.entity.Book; import com.test.mapper.BookMapper; import com.test.service.BookService; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import com.test.entity.Book; /** * ClassName: BookServiceImpl diff --git a/book-service/src/main/resources/application.yml b/book-service/src/main/resources/application.yml index c0146f8..6a7f5d9 100644 --- a/book-service/src/main/resources/application.yml +++ b/book-service/src/main/resources/application.yml @@ -6,6 +6,8 @@ spring: url: jdbc:mysql://43.143.164.194:3306/mac username: mac password: mactest + application: + name: bookservice security: oauth2: client: diff --git a/borrow-service/src/main/java/com/test/config/WebConfiguration.java b/borrow-service/src/main/java/com/test/config/WebConfiguration.java index 76e243f..10ce001 100644 --- a/borrow-service/src/main/java/com/test/config/WebConfiguration.java +++ b/borrow-service/src/main/java/com/test/config/WebConfiguration.java @@ -1,5 +1,6 @@ package com.test.config; +import org.springframework.cloud.client.loadbalancer.LoadBalanced; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.oauth2.client.OAuth2ClientContext; diff --git a/borrow-service/src/main/resources/application.yml b/borrow-service/src/main/resources/application.yml index 20977ed..721e08e 100644 --- a/borrow-service/src/main/resources/application.yml +++ b/borrow-service/src/main/resources/application.yml @@ -6,6 +6,8 @@ spring: url: jdbc:mysql://43.143.164.194:3306/mac username: mac password: mactest + application: + name: borrowservice security: oauth2: client: diff --git a/user-service/src/main/java/com/test/UserApplication.java b/user-service/src/main/java/com/test/UserApplication.java index 9856d1c..dffc676 100644 --- a/user-service/src/main/java/com/test/UserApplication.java +++ b/user-service/src/main/java/com/test/UserApplication.java @@ -2,7 +2,6 @@ package com.test; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.security.oauth2.client.EnableOAuth2Sso; import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer; /** diff --git a/user-service/src/main/resources/application.yml b/user-service/src/main/resources/application.yml index 3f85199..85034ab 100644 --- a/user-service/src/main/resources/application.yml +++ b/user-service/src/main/resources/application.yml @@ -6,6 +6,8 @@ spring: url: jdbc:mysql://43.143.164.194:3306/mac username: mac password: mactest + application: + name: userservice security: oauth2: client: