diff --git a/epmet-lb-test/Dockerfile b/epmet-lb-test/Dockerfile deleted file mode 100644 index bef7728a03..0000000000 --- a/epmet-lb-test/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM java:8 - -RUN export LANG="zh_CN.UTF-8" -RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -RUN echo 'Asia/Shanghai' > /etc/timezone - -COPY ./target/*.jar ./epmet-lb-test.jar - -EXPOSE 9999 - -ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"] \ No newline at end of file diff --git a/epmet-lb-test/deploy/docker-compose-dev.yml b/epmet-lb-test/deploy/docker-compose-dev.yml deleted file mode 100644 index c8195d6794..0000000000 --- a/epmet-lb-test/deploy/docker-compose-dev.yml +++ /dev/null @@ -1,18 +0,0 @@ -version: "3.7" -services: - epmet-lb-test: - container_name: epmet-lb-test-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-lb-test:version_placeholder - ports: - - "9999:9999" - network_mode: host # 不会创建新的网络 - volumes: - - "/opt/epmet-cloud-logs/dev:/logs" - environment: - RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-lb-test.jar" - restart: "unless-stopped" - deploy: - resources: - limits: - cpus: '0.1' - memory: 300M \ No newline at end of file diff --git a/epmet-lb-test/pom.xml b/epmet-lb-test/pom.xml deleted file mode 100644 index 8266cdb279..0000000000 --- a/epmet-lb-test/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - epmet-cloud - com.epmet - 2.0.0 - - 4.0.0 - - epmet-lb-test - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework - spring-context-support - - - org.springframework.boot - spring-boot-starter-actuator - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - io.github.openfeign - feign-httpclient - 10.3.0 - - - org.springframework.cloud - spring-cloud-starter-openfeign - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - \ No newline at end of file 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 deleted file mode 100644 index 54b62267ed..0000000000 --- a/epmet-lb-test/src/main/java/com/epmet/lbtest/LoadBalancerApp.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.epmet.lbtest; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.openfeign.EnableFeignClients; - -@EnableDiscoveryClient -@EnableFeignClients -@SpringBootApplication -public class LoadBalancerApp { - public static void main(String[] args) { - SpringApplication.run(LoadBalancerApp.class, 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 deleted file mode 100644 index a812b2c026..0000000000 --- a/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.epmet.lbtest.controller; - -import com.epmet.lbtest.feign.TestCallFeignClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.commons.util.InetUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import java.net.Inet4Address; -import java.net.InetAddress; -import java.net.UnknownHostException; - -@RestController -@RequestMapping("lb") -public class LbController { - - @Autowired - private InetUtils inetUtils; - - @Autowired - private TestCallFeignClient testCallFeignClient; - - @GetMapping("test") - public String test() { - return inetUtils.findFirstNonLoopbackHostInfo().getIpAddress(); - } -} 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 deleted file mode 100644 index 32c7e50873..0000000000 --- a/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClient.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.epmet.lbtest.feign; - -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; - -@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 deleted file mode 100644 index 3decf23b19..0000000000 --- a/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClientFallback.java +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index 79377cd03a..0000000000 --- a/epmet-lb-test/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,74 +0,0 @@ -server: - port: 9999 - servlet: - context-path: /lbtest - -spring: - main: - allow-bean-definition-overriding: true - application: - name: lb-test - #环境 dev|test|prod - profiles: - active: local - 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: - server-addr: 192.168.1.130:8848 - #nacos的命名空间ID,默认是public - namespace: 6ceab336-d004-4acf-89c6-e121d06f4988 - #不把自己注册到注册中心的地址 - register-enabled: true - ip: "" - config: - enabled: false - server-addr: 192.168.1.130:8848 - namespace: "" - group: "" - file-extension: yaml - #指定共享配置,且支持动态刷新 - -management: - endpoints: - web: - exposure: - include: "*" - endpoint: - health: - show-details: ALWAYS - -feign: - hystrix: - enabled: true - client: - config: - default: - loggerLevel: BASIC - httpclient: - enabled: true - -hystrix: - command: - default: - execution: - isolation: - thread: - timeoutInMilliseconds: 60000 #缺省为1000 - -ribbon: - ReadTimeout: 300000 - ConnectTimeout: 300000 - -#feign 日志需要该配置 -logging: - level: - com.epmet: debug \ No newline at end of file diff --git a/epmet-lb-test/src/main/resources/logback-spring-.xml b/epmet-lb-test/src/main/resources/logback-spring-.xml deleted file mode 100644 index 856dc844c8..0000000000 --- a/epmet-lb-test/src/main/resources/logback-spring-.xml +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - ${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} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -