From b28f0544c8a865692f74819d91ea7cafa3e53b0f Mon Sep 17 00:00:00 2001
From: fangzhipeng <124746406@qq.com>
Date: Thu, 3 Jan 2019 17:58:19 +0800
Subject: [PATCH] sc admin

---
 sc-f-boot-admin-cloud/admin-client/pom.xml    |  5 +----
 .../src/main/resources/application.yml        |  7 ++++++
 sc-f-boot-admin/admin-client/pom.xml          |  8 +++----
 .../adminclient/AdminClientApplication.java   | 22 +++++++++----------
 .../src/main/resources/application.yml        |  4 ----
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/sc-f-boot-admin-cloud/admin-client/pom.xml b/sc-f-boot-admin-cloud/admin-client/pom.xml
index 37d91f6..fadc557 100644
--- a/sc-f-boot-admin-cloud/admin-client/pom.xml
+++ b/sc-f-boot-admin-cloud/admin-client/pom.xml
@@ -34,10 +34,7 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.jolokia</groupId>
-            <artifactId>jolokia-core</artifactId>
-        </dependency>
+
 
 
     </dependencies>
diff --git a/sc-f-boot-admin-cloud/admin-server/src/main/resources/application.yml b/sc-f-boot-admin-cloud/admin-server/src/main/resources/application.yml
index 543562f..a412b4e 100644
--- a/sc-f-boot-admin-cloud/admin-server/src/main/resources/application.yml
+++ b/sc-f-boot-admin-cloud/admin-server/src/main/resources/application.yml
@@ -27,3 +27,10 @@ management:
   endpoint:
     health:
       show-details: ALWAYS
+
+
+spring.mail.host: smtp.163.com
+spring.mail.username: miles02
+spring.mail.password:
+spring.boot.admin.notify.mail.to: 124746406@qq.com
+
diff --git a/sc-f-boot-admin/admin-client/pom.xml b/sc-f-boot-admin/admin-client/pom.xml
index bc48f27..3fca582 100644
--- a/sc-f-boot-admin/admin-client/pom.xml
+++ b/sc-f-boot-admin/admin-client/pom.xml
@@ -23,10 +23,10 @@
             <artifactId>spring-boot-admin-starter-client</artifactId>
             <version>2.1.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.springframework.boot</groupId>-->
+            <!--<artifactId>spring-boot-starter-security</artifactId>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
diff --git a/sc-f-boot-admin/admin-client/src/main/java/com/forezp/adminclient/AdminClientApplication.java b/sc-f-boot-admin/admin-client/src/main/java/com/forezp/adminclient/AdminClientApplication.java
index 6ade290..023ba20 100644
--- a/sc-f-boot-admin/admin-client/src/main/java/com/forezp/adminclient/AdminClientApplication.java
+++ b/sc-f-boot-admin/admin-client/src/main/java/com/forezp/adminclient/AdminClientApplication.java
@@ -2,9 +2,9 @@ package com.forezp.adminclient;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+//import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 
 @SpringBootApplication
 public class AdminClientApplication {
@@ -14,13 +14,13 @@ public class AdminClientApplication {
     }
 
 
-    @Configuration
-    public static class SecurityPermitAllConfig extends WebSecurityConfigurerAdapter {
-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-            http.authorizeRequests().anyRequest().permitAll()
-                    .and().csrf().disable();
-        }
-    }
+//    @Configuration
+//    public static class SecurityPermitAllConfig extends WebSecurityConfigurerAdapter {
+//        @Override
+//        protected void configure(HttpSecurity http) throws Exception {
+//            http.authorizeRequests().anyRequest().permitAll()
+//                    .and().csrf().disable();
+//        }
+//    }
 }
 
diff --git a/sc-f-boot-admin/admin-server/src/main/resources/application.yml b/sc-f-boot-admin/admin-server/src/main/resources/application.yml
index 21f9dd3..3050e60 100644
--- a/sc-f-boot-admin/admin-server/src/main/resources/application.yml
+++ b/sc-f-boot-admin/admin-server/src/main/resources/application.yml
@@ -3,7 +3,3 @@ spring:
     name: admin-server
 server:
   port: 8769
-#eureka:
-#  client:
-#    serviceUrl:
-#      defaultZone: http://localhost:8761/eureka/
\ No newline at end of file