diff --git a/epmet-lb-test/Dockerfile b/epmet-lb-test/Dockerfile index 9ce4250290..bef7728a03 100644 --- a/epmet-lb-test/Dockerfile +++ b/epmet-lb-test/Dockerfile @@ -8,4 +8,4 @@ COPY ./target/*.jar ./epmet-lb-test.jar EXPOSE 9999 -ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"] \ No newline at end of file +ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"] \ No newline at end of file diff --git a/epmet-lb-test/pom.xml b/epmet-lb-test/pom.xml index 02b1f6e8ee..8e6b30b65b 100644 --- a/epmet-lb-test/pom.xml +++ b/epmet-lb-test/pom.xml @@ -43,6 +43,11 @@ feign-httpclient 10.3.0 + + com.epmet + epmet-commons-tools + 2.0.0 + diff --git a/epmet-lb-test/src/main/java/com/epmet/lbtest/LoadBalancerApp.java b/epmet-lb-test/src/main/java/com/epmet/lbtest/LoadBalancerApp.java index d447a63a15..57dabcea3a 100644 --- a/epmet-lb-test/src/main/java/com/epmet/lbtest/LoadBalancerApp.java +++ b/epmet-lb-test/src/main/java/com/epmet/lbtest/LoadBalancerApp.java @@ -2,7 +2,9 @@ package com.epmet.lbtest; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; +@EnableFeignClients @SpringBootApplication public class LoadBalancerApp { public static void main(String[] args) { diff --git a/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java b/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java index 9ad9c71c45..5af5549dfb 100644 --- a/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java +++ b/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java @@ -1,5 +1,7 @@ package com.epmet.lbtest.controller; +import com.epmet.lbtest.feign.TestCallFeignClient; +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; @@ -10,10 +12,20 @@ import javax.servlet.http.HttpServletRequest; @RequestMapping("lb") public class LbController { + @Autowired + private TestCallFeignClient testCallFeignClient; + @GetMapping("test") public String test(HttpServletRequest request) { String localAddr = request.getServerName(); return localAddr; } + @GetMapping("test-cal") + public String testCall() { + String result = testCallFeignClient.test(); + System.out.println("调用结果:" + result); + return result; + } + } diff --git a/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClient.java b/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClient.java new file mode 100644 index 0000000000..4ce7336045 --- /dev/null +++ b/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClient.java @@ -0,0 +1,12 @@ +package com.epmet.lbtest.feign; + +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +import javax.servlet.http.HttpServletRequest; + +@FeignClient(name = "lb-test", fallback = TestCallFeignClientFallback.class) +public interface TestCallFeignClient { + @GetMapping("/lbtest/lb/test") + String test(); +} diff --git a/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClientFallback.java b/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClientFallback.java new file mode 100644 index 0000000000..3decf23b19 --- /dev/null +++ b/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClientFallback.java @@ -0,0 +1,11 @@ +package com.epmet.lbtest.feign; + +import org.springframework.stereotype.Component; + +@Component +public class TestCallFeignClientFallback implements TestCallFeignClient { + @Override + public String test() { + return "请求出错"; + } +} diff --git a/epmet-lb-test/src/main/resources/bootstrap.yml b/epmet-lb-test/src/main/resources/bootstrap.yml index 2335b723ff..79377cd03a 100644 --- a/epmet-lb-test/src/main/resources/bootstrap.yml +++ b/epmet-lb-test/src/main/resources/bootstrap.yml @@ -14,6 +14,12 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + redis: + database: 0 + host: 192.168.1.130 + port: 6379 + password: 123456 + timeout: 30s cloud: nacos: discovery: diff --git a/epmet-lb-test/src/main/resources/logback-spring.xml b/epmet-lb-test/src/main/resources/logback-spring.xml new file mode 100644 index 0000000000..856dc844c8 --- /dev/null +++ b/epmet-lb-test/src/main/resources/logback-spring.xml @@ -0,0 +1,169 @@ + + + + + + + + + + + + ${appname} + + + + + + + + + debug + + + ${CONSOLE_LOG_PATTERN} + + UTF-8 + + + + + + + + ${log.path}/debug.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/debug-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + debug + ACCEPT + DENY + + + + + + + ${log.path}/info.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/info-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + info + ACCEPT + DENY + + + + + + + ${log.path}/warn.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/warn-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + warn + ACCEPT + DENY + + + + + + + ${log.path}/error.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/error-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + ERROR + ACCEPT + DENY + ${webHook} + ${secret} + ${appname} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +