Browse Source

服务追踪

Progr1mmer 6 years ago
parent
commit
a5ef5e51bf

+ 2 - 2
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/web/endpoint/EnvelopRestEndpoint.java

@ -119,11 +119,11 @@ public abstract class EnvelopRestEndpoint {
        return mixEnvelop;
    }
    protected <E extends Envelop> Envelop failed(String message, Class<E> clazz) {
    protected <E extends Envelop> E failed(String message, Class<E> clazz) {
        return failed(message, -10000, clazz);
    }
    protected <E extends Envelop> Envelop failed(String message, int status, Class<E> clazz) {
    protected <E extends Envelop> E failed(String message, int status, Class<E> clazz) {
        try {
            E envelop = clazz.newInstance();
            envelop.setMessage(message);

+ 0 - 1
common/common-web/src/main/java/com/yihu/jw/web/handler/GlobalExceptionHandler.java

@ -5,7 +5,6 @@ import com.yihu.jw.restmodel.web.Envelop;
import feign.FeignException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.web.HttpRequestMethodNotSupportedException;
import org.springframework.web.bind.MissingServletRequestParameterException;

+ 4 - 0
gateway/ag-basic/pom.xml

@ -53,6 +53,10 @@
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-config</artifactId>
        </dependency>
        <!--<dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-zipkin</artifactId>
        </dependency>-->
        <!-- 安全认证中心-->
        <dependency>

+ 9 - 2
gateway/ag-basic/src/main/resources/application.yml

@ -10,7 +10,14 @@ zuul:
      serviceId: svr-iot
    svr-base:
      path: /base/**
      serviceId: svr-base
      serviceId: svr-base-sxy
    demo:
      path: /baidu/**
      url: https://www.baidu.com
      url: https://www.baidu.com
spring:
  zipkin:
    base-url: http://localhost:9411
  sleuth:
    sampler:
      percentage: 1.0

+ 14 - 1
server/svr-configuration/src/main/resources/bootstrap.yml

@ -25,4 +25,17 @@ spring:
        git:
          uri: ${wlyy.spring.config.git.uri:http://192.168.1.220:10080/jiwei/wlyy2.0.config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:jwdev}
        default-label: ${wlyy.spring.config.git.label:jwdev}
---
spring:
  profiles: jwprod
##git配置
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://192.168.1.220:10080/jiwei/wlyy2.0.config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:jwprod}

+ 0 - 46
server/svr-log-server/src/main/resources/bootstrap.yml

@ -1,46 +0,0 @@
##优先读取 boostarap配置 然后在读取application。yml的配置
spring:
  #从发现服务里面取配置服务的信息
  cloud:
    config:
      failFast: true ##启动快速失败 即链接不到配置服务就启动失败
      username: jw
      password: jkzl
      discovery:
        enabled: true ##使用发现服务
        service-id: svr-configurations ##配置服务的名字
---
spring:
  profiles: jwdev
##发现服务的地址
eureka:
  client:
    serviceUrl:
      #http://账号:密码@127.0.0.1:8761/eureka/
      defaultZone: http://jw:jkzl@172.19.103.33:8761/eureka/
---
spring:
  profiles: jwtest
eureka:
  client:
    serviceUrl:
      #http://账号:密码@127.0.0.1:8761/eureka/
      defaultZone: http://jw:jkzl@172.19.103.33:8761/eureka/
---
spring:
  profiles: jwprod
eureka:
  client:
    serviceUrl:
      #http://账号:密码@127.0.0.1:8761/eureka/
      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka/

+ 25 - 27
server/svr-log-server/pom.xml

@ -9,11 +9,28 @@
        <version>2.0.0</version>
        <relativePath>../../wlyy-parent-pom/pom.xml</relativePath>
    </parent>
    <groupId>com.yih.jw</groupId>
    <artifactId>svr-log-server</artifactId>
    <version>${parent.version}</version>
    <artifactId>svr-zipkin</artifactId>
    <dependencies>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</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.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
        <dependency>
            <groupId>io.zipkin.java</groupId>
            <artifactId>zipkin-server</artifactId>
@ -33,39 +50,20 @@
            <version>1.21.0</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</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>
    </dependencies>
    <build>
        <finalName>svr-logServer</finalName>
        <finalName>svr-zipkin</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <executions>
                    <execution>
                        <goals>
                            <goal>repackage</goal>
                        </goals>
                    </execution>
                </executions>
            </plugin>
            <plugin>
                <artifactId>maven-war-plugin</artifactId>
                <configuration>
                    <mainClass>com.yihu.jw.LogServerApplication</mainClass>
                    <failOnMissingWebXml>false</failOnMissingWebXml>
                    <filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>
                </configuration>
            </plugin>
        </plugins>

server/svr-log-server/readme.MD → server/svr-zipkin/readme.MD


+ 3 - 5
server/svr-log-server/src/main/java/com/yihu/jw/LogServerApplication.java

@ -1,19 +1,17 @@
package com.yihu.jw;
package com.yihu;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import zipkin.server.EnableZipkinServer;
/**
 * Created by chenweida on 2017/5/18.
 */
@SpringBootApplication
@EnableDiscoveryClient
@EnableZipkinServer
public class LogServerApplication {
public class SvrZipkin {
    public static void main(String[] args) {
        SpringApplication.run(LogServerApplication.class, args);
        SpringApplication.run(SvrZipkin.class, args);
    }
}

+ 3 - 4
server/svr-log-server/src/main/resources/application.yml

@ -1,12 +1,11 @@
spring:
  application:
    name: svr-logServer
server:
  port: 9411
---
spring:
  profiles: jwdev
##分布式日志存在es里面
#分布式日志存在es里面
zipkin:
  storage:
    type: elasticsearch

server/svr-log-server/src/main/resources/banner.txt → server/svr-zipkin/src/main/resources/banner.txt


+ 26 - 0
server/svr-zipkin/src/main/resources/bootstrap.yml

@ -0,0 +1,26 @@
##优先读取 boostarap配置 然后在读取application。yml的配置
spring:
  application:
    name: svr-zipkin
  #从发现服务里面取配置服务的信息
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      username: jw
      password: jkzl
---
spring:
  profiles: jwdev
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://172.17.110.212:1221}
      label: ${wlyy.spring.config.label:jwdev}
---
spring:
  profiles: jwtest
  cloud:
    config:
      uri: ${wlyy.pring.config.uri:http://172.17.110.212:1221}
      label: ${wlyy.spring.config.label:jwdev}

+ 4 - 0
svr/svr-base/pom.xml

@ -54,6 +54,10 @@
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-config</artifactId>
        </dependency>
        <!--<dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-zipkin</artifactId>
        </dependency>-->
        <dependency>
            <groupId>org.json</groupId>

+ 1 - 4
svr/svr-base/src/main/resources/application.yml

@ -22,7 +22,6 @@ spring:
    min-evictable-idle-time-millis: 3600000 #连接池中连接,在时间段内一直空闲,被逐出连接池的时间(1000*60*60),以毫秒为单位
    time-between-eviction-runs-millis: 300000 #在空闲连接回收器线程运行期间休眠的时间值,以毫秒为单位,一般比minEvictableIdleTimeMillis小
hibernate:
  dialect: org.hibernate.dialect.MySQL5Dialect
  show_sql: true
@ -44,13 +43,11 @@ spring:
    username: root
    password: 123456
  zipkin:
    base-url: http://192.168.131.173:${server.svr-logServer-port} #日志追踪的地址
    base-url: http://localhost:9411 #日志追踪的地址
  sleuth:
    sampler:
      percentage: 1.0 #采用需要的请求的百分比 默认是0.1 即 10%
---
spring:
  profiles: jwtest

+ 10 - 2
svr/svr-base/src/main/resources/bootstrap.yml

@ -1,6 +1,6 @@
spring:
  application:
    name: svr-base-lyx
    name: svr-base-sxy
  cloud:
    config:
      failFast: true
@ -21,4 +21,12 @@ spring:
  cloud:
    config:
      uri: ${wlyy.pring.config.uri:http://172.17.110.212:1221}
      label: ${wlyy.spring.config.label:jwdev}
      label: ${wlyy.spring.config.label:jwdev}
---
spring:
  profiles: jwprod
  cloud:
    config:
      uri: ${wlyy.pring.config.uri:http://172.17.110.212:1221}
      label: ${wlyy.spring.config.label:jwprod}

+ 1 - 1
wlyy-parent-pom/pom.xml

@ -56,7 +56,7 @@
        <module>../server/svr-discovery</module><!--发现服务-->
        <!-- 暂时保留 -->
        <!--<module>../server/svr-dashboard</module>--><!--监控服务-->
        <!--<module>../server/svr-log-server</module>--><!--分布式追踪服务-->
        <module>../server/svr-zipkin</module> <!--分布式追踪服务-->
        <!-- 暂时保留 -->
        <!-- 网关服务 -->