Merge branch 'dev' of chenweida/wlyy2.0 into dev

server/svr-admin-server/pom.xml

@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
    <parent>
        <groupId>com.yihu.jw</groupId>
        <artifactId>svr-lib-parent-pom</artifactId>
        <version>1.0.0</version>
        <relativePath>../../svr-lib-parent-pom/pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>svr-admin-server</artifactId>
    <dependencies>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-mail</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-actuator-docs</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
        <!--服务器监监听-->
        <dependency>
            <groupId>de.codecentric</groupId>
            <artifactId>spring-boot-admin-server</artifactId>
        </dependency>
        <dependency>
            <groupId>de.codecentric</groupId>
            <artifactId>spring-boot-admin-server-ui</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-mail</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-eureka</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-config</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-zuul</artifactId>
        </dependency>
        <dependency>
            <groupId>com.netflix.servo</groupId>
            <artifactId>servo-core</artifactId>
        </dependency>
    </dependencies>
</project>

server/svr-admin-server/readme.MD

@@ -0,0 +1,4 @@
监测服务器
官网地址
http://codecentric.github.io/spring-boot-admin/1.5.3/#_reminder_notifications

server/svr-admin-server/src/main/java/com.yihu.admin/AdminServer.java

@@ -0,0 +1,18 @@
package com.yihu.admin;
import de.codecentric.boot.admin.config.EnableAdminServer;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.Configuration;
/**
 * Created by chenweida on 2017/8/15.
 */
@Configuration
@EnableAutoConfiguration
@EnableAdminServer
public class AdminServer {
    public static void main(String[] args) {
        SpringApplication.run(AdminServer.class, args);
    }
}

server/svr-admin-server/src/main/java/com.yihu.admin/email/MyMailNotifier.java

@@ -0,0 +1,124 @@
//package com.yihu.admin.email;
//
//import de.codecentric.boot.admin.event.ClientApplicationEvent;
//import de.codecentric.boot.admin.notify.MailNotifier;
//import org.slf4j.Logger;
//import org.slf4j.LoggerFactory;
//import org.springframework.boot.context.properties.ConfigurationProperties;
//import org.springframework.expression.EvaluationContext;
//import org.springframework.expression.Expression;
//import org.springframework.expression.ParserContext;
//import org.springframework.expression.spel.standard.SpelExpressionParser;
//import org.springframework.expression.spel.support.StandardEvaluationContext;
//import org.springframework.mail.MailSender;
//import org.springframework.mail.SimpleMailMessage;
//import org.springframework.stereotype.Component;
//
//import java.util.Arrays;
//
///**
// * Created by chenweida on 2018/5/8 0008.
// * de.codecentric.boot.admin.config.NotifierConfiguration */
//@Component
//@ConfigurationProperties("spring.boot.admin.notify.mail")
//public class MyMailNotifier extends MailNotifier {
//
//
//    private static final String DEFAULT_SUBJECT = "#{application.name} (#{application.id}) is #{to.status}";
//    private static final String DEFAULT_TEXT = "#{application.name} (#{application.id})\nstatus changed from #{from.status} to #{to.status}\n\n#{application.healthUrl}";
//
//    private final SpelExpressionParser parser = new SpelExpressionParser();
//
//    private Logger logger = LoggerFactory.getLogger(MyMailNotifier.class);
//
//    private final MailSender sender;
//
//    /**
//     * recipients of the mail
//     */
//    private String to[] = {"root@localhost"};
//
//    /**
//     * cc-recipients of the mail
//     */
//    private String cc[];
//
//    /**
//     * sender of the change
//     */
//    private String from = null;
//
//    /**
//     * Mail Text. SpEL template using event as root;
//     */
//    private Expression text;
//
//    /**
//     * Mail Subject. SpEL template using event as root;
//     */
//    private Expression subject;
//
//    public MyMailNotifier(MailSender sender) {
//        super(sender);
//        logger.info("init email");
//        this.sender = sender;
//        this.subject = parser.parseExpression(DEFAULT_SUBJECT, ParserContext.TEMPLATE_EXPRESSION);
//        this.text = parser.parseExpression(DEFAULT_TEXT, ParserContext.TEMPLATE_EXPRESSION);
//
//    }
//
//    @Override
//    protected void doNotify(ClientApplicationEvent event) {
//        logger.info("send email");
//        EvaluationContext context = new StandardEvaluationContext(event);
//
//        SimpleMailMessage message = new SimpleMailMessage();
//        message.setTo(to);
//        message.setFrom(from);
//        message.setSubject(subject.getValue(context, String.class));
//        message.setText(text.getValue(context, String.class));
//        message.setCc(cc);
//
//        sender.send(message);
//    }
//
//    public void setTo(String[] to) {
//        this.to = Arrays.copyOf(to, to.length);
//    }
//
//    public String[] getTo() {
//        return Arrays.copyOf(to, to.length);
//    }
//
//    public void setCc(String[] cc) {
//        this.cc = Arrays.copyOf(cc, cc.length);
//    }
//
//    public String[] getCc() {
//        return Arrays.copyOf(cc, cc.length);
//    }
//
//    public void setFrom(String from) {
//        this.from = from;
//    }
//
//    public String getFrom() {
//        return from;
//    }
//
//    public void setSubject(String subject) {
//        this.subject = parser.parseExpression(subject, ParserContext.TEMPLATE_EXPRESSION);
//    }
//
//    public String getSubject() {
//        return subject.getExpressionString();
//    }
//
//    public void setText(String text) {
//        this.text = parser.parseExpression(text, ParserContext.TEMPLATE_EXPRESSION);
//    }
//
//    public String getText() {
//        return text.getExpressionString();
//    }
//}

server/svr-admin-server/src/main/resources/application.yml

@@ -0,0 +1,37 @@
server:
  port: 8082
spring:
  application:
    name: svr-admin-server
  mail:
    host: smtp.qq.com
    port: 465
    username: 1501877145@qq.com
    protocol: smtp
    password: uihqhvqtrnkwhdhf #QQ的授权码
    properties:
      mail:
        smtp:
          auth: true
          socketFactory:
           class: javax.net.ssl.SSLSocketFactory
          starttls: true
          required: true
  boot:
    admin:
      url: http://localhost:${server.port}
      notify:
        mail:
          to: 494679975@qq.com
          from: 1501877145@qq.com
  jackson:
    serialization:
      indent_output: true
management:
  security:
    enabled: false

server/svr-admin-server/src/main/resources/bootstrap.yml

@@ -0,0 +1,27 @@
##优先读取 boostarap配置 然后在读取application。yml的配置
spring:
  #从发现服务里面取配置服务的信息
  cloud:
    config:
      username: jw
      password: jkzl
      failFast: true ##启动快速失败 即链接不到配置服务就启动失败
      discovery:
        enabled: true ##使用发现服务
        service-id: svr-configurations ##配置服务的名字
##发现服务的地址
eureka:
  client:
    serviceUrl:
      #http://账号:密码@127.0.0.1:8761/eureka/
      defaultZone: http://jw:jkzl@127.0.0.1:8761//eureka/
  instance:
    #eurika使用IP不使用host
    prefer-ip-address: true
    #定制化在eurika中显示的名称
    ##instance-id: ${spring.application.name}:${spring.application.instance_id:${server.port}}
    instance-id: ${spring.cloud.client.ipAddress}:${server.port}

server/svr-admin-server/src/main/resources/logback.xml

@@ -0,0 +1,4 @@
<configuration>
    <include resource="org/springframework/boot/logging/logback/base.xml"/>
    <jmxConfigurator/>
</configuration>

server/svr-configuration/src/main/resources/application.yml

@@ -18,7 +18,9 @@ eureka:
    ##instance-id: ${spring.application.name}:${spring.application.instance_id:${server.port}}
    instance-id: ${spring.cloud.client.ipAddress}:${server.port}
management:
  security:
    enabled: false
---

server/svr-configuration/src/main/resources/bootstrap.yml

@@ -4,6 +4,8 @@ spring:
  jmx:
    default-domain: ${spring.application.name}
security:
  user:
    name: jw
@@ -19,7 +21,8 @@ eureka:
    #定制化在eurika中显示的名称
    ##instance-id: ${spring.application.name}:${spring.application.instance_id:${server.port}}
    instance-id: ${spring.cloud.client.ipAddress}:${server.port}
    appname: svr-configurations
    health-check-url-path: /health

svr-lib-parent-pom/pom.xml

@@ -81,7 +81,7 @@
        <version.joda-time>2.8.2</version.joda-time>
        <version.solr>5.5.1</version.solr>
        <version.fastdfs>1.25</version.fastdfs>
        <version.spring-boot-admin>1.5.7</version.spring-boot-admin>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <asciidoctor.maven.plugin.version>1.5.5</asciidoctor.maven.plugin.version>
@@ -91,6 +91,17 @@
    <!--dependencyManagement作用子配置不写版本默认继承父配置-->
    <dependencyManagement>
        <dependencies>
            <!--服务器监监听-->
            <dependency>
                <groupId>de.codecentric</groupId>
                <artifactId>spring-boot-admin-server</artifactId>
                <version>${version.spring-boot-admin}</version>
            </dependency>
            <dependency>
                <groupId>de.codecentric</groupId>
                <artifactId>spring-boot-admin-server-ui</artifactId>
                <version>${version.spring-boot-admin}</version>
            </dependency>
            <dependency>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-dependencies</artifactId>