集成链路跟踪

esua-epdc/epdc-admin/epdc-admin-server/pom.xml

@@ -45,6 +45,11 @@
             <artifactId>spring-boot-admin-starter-client</artifactId>
             <version>${spring.boot.admin.version}</version>
         </dependency>
+        <!-- zipkin client -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-zipkin</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -81,6 +86,8 @@
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+
+                <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
             </properties>
         </profile>
         <profile>
@@ -92,6 +99,8 @@
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+
+                <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
             </properties>
         </profile>
         <profile>
@@ -103,6 +112,8 @@
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+
+                <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
             </properties>
         </profile>
     </profiles>

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-dev.yml

@@ -8,7 +8,7 @@ spring:
   datasource:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
+      url: jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
       username: epdc
       password: elink888
       #Oracle

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml

@@ -20,6 +20,16 @@ spring:
       discovery:
         server-addr: @nacos.server-addr@
         register-enabled: @nacos.register-enabled@
+    alibaba:
+      seata:
+        tx-service-group: epdc-admin-server-fescar-service-group
+  zipkin:
+    # 指定了 zipkin 服务器的地址
+    base-url: @spring.zipkin.base-url@
+    sleuth:
+      sampler:
+        # 将采样比例设置为 1.0，也就是全部都需要。默认是 0.1
+        probability: 1.0
 
 management:
   endpoints:

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/registry.conf

@@ -0,0 +1,21 @@
+registry {
+  # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa
+  type = "nacos"
+
+  nacos {
+    serverAddr = "47.104.224.45"
+    namespace = "public"
+    cluster = "default"
+  }
+}
+
+config {
+  # file、nacos 、apollo、zk、consul、etcd3
+  type = "nacos"
+
+  nacos {
+    serverAddr = "47.104.224.45"
+    namespace = "public"
+    cluster = "default"
+  }
+}

esua-epdc/epdc-auth/pom.xml

@@ -54,6 +54,11 @@
             <artifactId>kaptcha</artifactId>
             <version>${kaptcha.version}</version>
         </dependency>
+        <!-- zipkin client -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-zipkin</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -96,6 +101,8 @@
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+
+                <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
             </properties>
         </profile>
         <profile>
@@ -113,6 +120,8 @@
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+
+                <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
             </properties>
         </profile>
         <profile>
@@ -130,6 +139,8 @@
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+
+                <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
             </properties>
         </profile>
     </profiles>

esua-epdc/epdc-auth/src/main/resources/application.yml

@@ -27,6 +27,13 @@ spring:
       discovery:
         server-addr: @nacos.server-addr@
         register-enabled: @nacos.register-enabled@
+  zipkin:
+    # 指定了 zipkin 服务器的地址
+    base-url: @spring.zipkin.base-url@
+    sleuth:
+      sampler:
+        # 将采样比例设置为 1.0，也就是全部都需要。默认是 0.1
+        probability: 1.0
 
 management:
   endpoints:

esua-epdc/epdc-gateway/pom.xml

@@ -35,6 +35,11 @@
             <artifactId>spring-boot-admin-starter-client</artifactId>
             <version>${spring.boot.admin.version}</version>
         </dependency>
+        <!-- zipkin client -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-zipkin</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -74,10 +79,10 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <!-- gateway routes -->
-<!--                <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>-->
-                <gateway.routes.epdc-auth-server.uri>http://127.0.0.1:9091</gateway.routes.epdc-auth-server.uri>
-<!--                <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>-->
-                <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>
+                <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
+<!--                <gateway.routes.epdc-auth-server.uri>http://127.0.0.1:9091</gateway.routes.epdc-auth-server.uri>-->
+                <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
+<!--                <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>-->
                 <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server</gateway.routes.epdc-activiti-server.uri>
                 <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
                 <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
@@ -100,8 +105,10 @@
 <!--                <gateway.routes.epdc-user-server.uri>http://127.0.0.1:9068</gateway.routes.epdc-user-server.uri>-->
                 <gateway.routes.epdc-demo-server.uri>lb://epdc-demo-server</gateway.routes.epdc-demo-server.uri>
                 <!-- nacos -->
-                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+
+                <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
             </properties>
         </profile>
         <profile>
@@ -135,6 +142,8 @@
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+
+                <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
             </properties>
         </profile>
         <profile>
@@ -168,6 +177,8 @@
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+
+                <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
             </properties>
         </profile>
     </profiles>

esua-epdc/epdc-gateway/src/main/resources/application.yml

@@ -140,6 +140,13 @@ spring:
       discovery:
         server-addr: @nacos.server-addr@
         register-enabled: @nacos.register-enabled@
+  zipkin:
+    # 指定了 zipkin 服务器的地址
+    base-url: @spring.zipkin.base-url@
+    sleuth:
+      sampler:
+        # 将采样比例设置为 1.0，也就是全部都需要。默认是 0.1
+        probability: 1.0
 management:
   endpoints:
     web:
@@ -180,6 +187,7 @@ renren:
     - /activiti/modeler.html
     - /activiti/service/**
     - /activiti/editor-app/**
+    - /heart/**
 
 
 

esua-epdc/epdc-module/epdc-app/epdc-app-server/pom.xml

@@ -86,7 +86,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/epdc_demo?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
@@ -109,7 +109,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
@@ -132,7 +132,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>

esua-epdc/epdc-module/epdc-demo/epdc-demo-client/src/main/java/com/elink/esua/epdc/dto/DemoDto.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 用户
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+@Data
+public class DemoDto implements Serializable {
+
+    private static final long serialVersionUID = -8056876497668990939L;
+
+    /**
+     * 用户ID
+     */
+    private Long id;
+    /**
+     * 用户名
+     */
+    private String name;
+    /**
+     * 手机号
+     */
+    private int age;
+}

esua-epdc/epdc-module/epdc-demo/epdc-demo-client/src/main/java/com/elink/esua/epdc/feign/DemoFeignClient.java

@@ -0,0 +1,30 @@
+package com.elink.esua.epdc.feign;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.DemoDto;
+import com.elink.esua.epdc.feign.fallback.DemoFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.util.List;
+
+/**
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/8/23 9:59
+ */
+@FeignClient(name = ServiceConstant.EPDC_DEMO_SERVER, fallback = DemoFeignClientFallback.class, contextId = "DemoFeignClient")
+public interface DemoFeignClient {
+
+    /**
+     * 查询全部
+     *
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.DemoDto>>
+     * @author yujintao
+     * @date 2019/8/23 10:07
+     */
+    @GetMapping("demo/demo/list")
+    Result<List<DemoDto>> listDemo();
+}

esua-epdc/epdc-module/epdc-demo/epdc-demo-client/src/main/java/com/elink/esua/epdc/feign/fallback/DemoFeignClientFallback.java

@@ -0,0 +1,23 @@
+package com.elink.esua.epdc.feign.fallback;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.DemoDto;
+import com.elink.esua.epdc.feign.DemoFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ *
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/5/23 10:00
+ */
+@Component
+public class DemoFeignClientFallback implements DemoFeignClient {
+
+    @Override
+    public Result<List<DemoDto>> listDemo() {
+        return new Result().error("fail");
+    }
+}

esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml

@@ -48,6 +48,11 @@
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
         <!-- nacos end -->
+        <!-- zipkin client -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-zipkin</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/ModuleApplication.java → esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/DemoApplication.java

@@ -22,10 +22,10 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
-public class ModuleApplication {
+public class DemoApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(ModuleApplication.class, args);
+        SpringApplication.run(DemoApplication.class, args);
     }
 
 }

esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java

@@ -21,6 +21,6 @@ import org.springframework.stereotype.Service;
 public class ModuleConfigImpl implements ModuleConfig {
     @Override
     public String getName() {
-        return "module";
+        return "demo";
     }
 }

esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/controller/DemoController.java

@@ -9,12 +9,15 @@
 package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.DemoDto;
 import com.elink.esua.epdc.service.DemoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 测试接口
  *
@@ -37,4 +40,9 @@ public class DemoController {
         return demoService.createDemo(name, age);
     }
 
+    @GetMapping("list")
+    public Result<List<DemoDto>> listDemo(){
+        return demoService.demoService();
+    }
+
 }

esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/service/DemoService.java

@@ -10,8 +10,11 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.DemoDto;
 import com.elink.esua.epdc.entity.DemoEntity;
 
+import java.util.List;
+
 /**
  * 用户
  *
@@ -20,4 +23,14 @@ import com.elink.esua.epdc.entity.DemoEntity;
 public interface DemoService extends BaseService<DemoEntity> {
 
     Result<String> createDemo(String name, int age);
+
+    /**
+     * 查询全部
+     *
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.DemoDto>>
+     * @author yujintao
+     * @date 2019/8/23 10:05
+     */
+    Result<List<DemoDto>> demoService();
 }

esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/service/impl/DemoServiceImpl.java

@@ -8,13 +8,18 @@
 
 package com.elink.esua.epdc.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.DemoDao;
+import com.elink.esua.epdc.dto.DemoDto;
 import com.elink.esua.epdc.entity.DemoEntity;
 import com.elink.esua.epdc.service.DemoService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class DemoServiceImpl extends BaseServiceImpl<DemoDao, DemoEntity> implements DemoService {
 
@@ -26,4 +31,11 @@ public class DemoServiceImpl extends BaseServiceImpl<DemoDao, DemoEntity> implem
         baseDao.insert(entity);
         return new Result<String>().ok("demo执行完毕");
     }
+
+    @Override
+    public Result<List<DemoDto>> demoService() {
+        QueryWrapper<DemoEntity> demoEntityWrapper = new QueryWrapper<>();
+        List<DemoEntity> entityList = baseDao.selectList(demoEntityWrapper);
+        return new Result().ok(ConvertUtils.sourceToTarget(entityList,DemoDto.class));
+    }
 }

esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/resources/application.yml

@@ -36,6 +36,13 @@ spring:
     alibaba:
       seata:
         tx-service-group: epdc-demo-server-fescar-service-group
+  zipkin:
+    # 指定了 zipkin 服务器的地址
+    base-url: http://localhost:9411
+    sleuth:
+      sampler:
+        # 将采样比例设置为 1.0，也就是全部都需要。默认是 0.1
+        probability: 1.0
 
 management:
   endpoints:

esua-epdc/epdc-module/epdc-heart/epdc-heart-client/pom.xml

@@ -12,5 +12,12 @@
     <artifactId>epdc-heart-client</artifactId>
     <packaging>jar</packaging>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-demo-client</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+    </dependencies>
 
 </project>

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml

@@ -45,6 +45,11 @@
             <artifactId>spring-boot-admin-starter-client</artifactId>
             <version>${spring.boot.admin.version}</version>
         </dependency>
+        <!-- zipkin client -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-zipkin</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -86,13 +91,15 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/epdc_demo?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>shibei@888</spring.datasource.druid.password>
 
-                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+
+                <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
             </properties>
         </profile>
 
@@ -109,13 +116,15 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+
+                <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
             </properties>
         </profile>
 
@@ -132,13 +141,15 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+
+                <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
             </properties>
         </profile>
     </profiles>

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/controller/DemoController.java

@@ -0,0 +1,33 @@
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.DemoDto;
+import com.elink.esua.epdc.feign.DemoFeignClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ *
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/8/23 10:59
+ */
+@RestController
+@RequestMapping("demo")
+public class DemoController {
+
+
+    @Autowired
+    private DemoFeignClient demoFeignClient;
+
+
+    @GetMapping("listAll")
+    public Result<List<DemoDto>> listDemo(){
+        Result<List<DemoDto>> listResult = demoFeignClient.listDemo();
+        return listResult;
+    }
+}

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml

@@ -35,6 +35,13 @@ spring:
       url: @spring.datasource.druid.url@
       username: @spring.datasource.druid.username@
       password: @spring.datasource.druid.password@
+  zipkin:
+    # 指定了 zipkin 服务器的地址
+    base-url: @spring.zipkin.base-url@
+    sleuth:
+      sampler:
+        # 将采样比例设置为 1.0，也就是全部都需要。默认是 0.1
+        probability: 1.0
 
 
 management:

esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml

@@ -115,12 +115,12 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
 
-                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
             </properties>
         </profile>
@@ -138,7 +138,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
@@ -161,7 +161,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>

esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml

@@ -121,7 +121,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
@@ -144,7 +144,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
@@ -167,7 +167,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>

esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/pom.xml

@@ -86,7 +86,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
@@ -109,7 +109,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
@@ -132,7 +132,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>

esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml

@@ -86,7 +86,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
@@ -109,7 +109,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
@@ -132,7 +132,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>

esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml

@@ -129,7 +129,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
@@ -152,7 +152,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
@@ -175,7 +175,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>

esua-epdc/epdc-module/epdc-party/epdc-party-server/pom.xml

@@ -86,7 +86,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
@@ -109,7 +109,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
@@ -132,7 +132,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>

esua-epdc/epdc-module/epdc-services/epdc-services-server/pom.xml

@@ -86,7 +86,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
@@ -109,7 +109,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
@@ -132,7 +132,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>

esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml

@@ -86,7 +86,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
@@ -109,7 +109,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
@@ -132,7 +132,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>