Browse Source

Merge remote-tracking branch 'origin/dev' into dev

dongbw 7 years ago
parent
commit
840cf37c0c
3 changed files with 9 additions and 13 deletions
  1. 5 4
      pom.xml
  2. 2 0
      src/main/java/com/uas/ps/product/Application.java
  3. 2 9
      src/main/resources/application.yml

+ 5 - 4
pom.xml

@@ -25,6 +25,11 @@
             <artifactId>ps-entity</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.uas.account</groupId>
+            <artifactId>sso-integration</artifactId>
+        </dependency>
+
         <!-- spring boot -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -42,10 +47,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.kafka</groupId>
             <artifactId>spring-kafka</artifactId>

+ 2 - 0
src/main/java/com/uas/ps/product/Application.java

@@ -1,5 +1,6 @@
 package com.uas.ps.product;
 
+import com.uas.account.sso.integration.config.EnableSSO;
 import com.uas.ps.core.util.ContextUtils;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -23,6 +24,7 @@ import java.io.PrintStream;
 @EnableTransactionManagement
 @SpringBootApplication
 @EnableWebMvc
+@EnableSSO
 public class Application {
     public static void main(String[] args) throws FileNotFoundException {
         File logFile = new File("logs/log.log");

+ 2 - 9
src/main/resources/application.yml

@@ -26,15 +26,8 @@ kafka:
  consumer:
   max-poll-interval-millis: 5000
 
-security:
- basic:
-  enabled: true
-  path: /
- user:
-  name: product-admin
-  password: select111***
-  role: ADMIN
- ignored: false
+sso:
+ secretKey: 0taQcW073Z7G628g5H
 
 ---
 spring: