Merge branch 'dev' of chenweida/patient-co-management into dev

Jolokia-admin-server/pom.xml

@@ -0,0 +1,25 @@
<?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">
    <artifactId>Jolokia-admin-server</artifactId>
    <groupId>com.yihu</groupId>
    <version>1.0.0</version>
    <modelVersion>4.0.0</modelVersion>
    <dependencies>
        <dependency>
            <groupId>de.codecentric</groupId>
            <artifactId>spring-boot-admin-server</artifactId>
            <version>1.3.5</version>
        </dependency>
        <dependency>
            <groupId>de.codecentric</groupId>
            <artifactId>spring-boot-admin-server-ui</artifactId>
            <version>1.3.5</version>
        </dependency>
    </dependencies>
</project>

Jolokia-admin-server/src/main/java/com/yihu/wlyy/jolokia/JolokiaApplication.java

@@ -0,0 +1,18 @@
package com.yihu.wlyy.jolokia;
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/7/25.
 */
@Configuration
@EnableAutoConfiguration
@EnableAdminServer
public class JolokiaApplication {
    public static void main(String[] args) {
        SpringApplication.run(JolokiaApplication.class, args);
    }
}

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

@@ -0,0 +1,6 @@
server:
  port: 8082
spring:
  boot:
    admin:
      preferIp: true

patient-co-statistics-es/pom.xml

@@ -381,6 +381,11 @@
            <artifactId>spring-boot-starter-mail</artifactId>
            <version>${version.spring-boot}</version>
        </dependency>
        <dependency>
            <groupId>de.codecentric</groupId>
            <artifactId>spring-boot-admin-starter-client</artifactId>
            <version>1.3.5</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>

patient-co-statistics-es/src/main/java/com/yihu/wlyy/statistics/config/WebSecurityConfig.java

@@ -22,8 +22,22 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
    protected void configure(HttpSecurity http) throws Exception {
        http.authorizeRequests()
                .antMatchers("/metrics/**").permitAll()
                .antMatchers("/health/**").permitAll()
                .antMatchers("/env/**").permitAll()
                .antMatchers("/dump/**").permitAll()
                .antMatchers("/trace/**").permitAll()
                .antMatchers("/mappings/**").permitAll()
                .antMatchers("/actuator/**").permitAll()
                .antMatchers("/beans/**").permitAll()
                .antMatchers("/configprops/**").permitAll()
                .antMatchers("/docs/**").permitAll()
                .antMatchers("/info/**").permitAll()
                .antMatchers("/configuration/**").permitAll()
                .antMatchers("/jolokia/**").permitAll()
                .anyRequest().authenticated()
                .and()
                .csrf().disable()
                .formLogin().defaultSuccessUrl("/swagger-ui.html").failureUrl("/login") //登录成功之后的跳转
                .permitAll()
                .and()

patient-co-statistics-es/src/main/resources/application.yml

@@ -2,6 +2,13 @@ server:
  port: 8081
spring:
  application:
    name: quota-es
  boot:
    admin:
      url: http://localhost:8082
      username: jkzl
      password: jkzlehr
  datasource:
    primaryReadWrite:
      driver-class-name: com.mysql.jdbc.Driver

patient-co-statistics-es/src/main/resources/logback.xml

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