From a5913eae41de15ff508870091e4941c36f7d7e1b Mon Sep 17 00:00:00 2001 From: whq <460794335@qq.com> Date: Mon, 24 Apr 2023 19:28:36 +0800 Subject: [PATCH 1/5] Twitter --- kn-service/vordm-twitter/Dockerfile | 15 ++++++++++++++ kn-service/vordm-twitter/pom.xml | 20 +++++++++++++++++++ .../crawl/twitter/TwitterApplication.java | 7 +++++++ .../src/main/resources/application-dev.yaml | 0 .../src/main/resources/application-prod.yaml | 0 .../src/main/resources/application.yaml | 12 +++++++++++ 6 files changed, 54 insertions(+) create mode 100644 kn-service/vordm-twitter/Dockerfile create mode 100644 kn-service/vordm-twitter/pom.xml create mode 100644 kn-service/vordm-twitter/src/main/java/com/kening/crawl/twitter/TwitterApplication.java create mode 100644 kn-service/vordm-twitter/src/main/resources/application-dev.yaml create mode 100644 kn-service/vordm-twitter/src/main/resources/application-prod.yaml create mode 100644 kn-service/vordm-twitter/src/main/resources/application.yaml diff --git a/kn-service/vordm-twitter/Dockerfile b/kn-service/vordm-twitter/Dockerfile new file mode 100644 index 0000000..a8eeb9b --- /dev/null +++ b/kn-service/vordm-twitter/Dockerfile @@ -0,0 +1,15 @@ +FROM bladex/alpine-java:openjdk8-openj9_cn_slim + +LABEL maintainer=whq<460794335@qq.com> + +RUN mkdir -p /kn/vordm + +WORKDIR /kn/vordm + +EXPOSE 8989 + +ADD ./target/vordm-crawl.jar ./app.jar + +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"] + +CMD ["--spring.profiles.active=test"] diff --git a/kn-service/vordm-twitter/pom.xml b/kn-service/vordm-twitter/pom.xml new file mode 100644 index 0000000..78ba4e5 --- /dev/null +++ b/kn-service/vordm-twitter/pom.xml @@ -0,0 +1,20 @@ + + + + kn-service + com.kening.platform + 1.0.0-SNAPSHOT + + 4.0.0 + + vordm-twitter + + + 8 + 8 + UTF-8 + + + diff --git a/kn-service/vordm-twitter/src/main/java/com/kening/crawl/twitter/TwitterApplication.java b/kn-service/vordm-twitter/src/main/java/com/kening/crawl/twitter/TwitterApplication.java new file mode 100644 index 0000000..9822078 --- /dev/null +++ b/kn-service/vordm-twitter/src/main/java/com/kening/crawl/twitter/TwitterApplication.java @@ -0,0 +1,7 @@ +package com.kening.platform; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello world!"); + } +} diff --git a/kn-service/vordm-twitter/src/main/resources/application-dev.yaml b/kn-service/vordm-twitter/src/main/resources/application-dev.yaml new file mode 100644 index 0000000..e69de29 diff --git a/kn-service/vordm-twitter/src/main/resources/application-prod.yaml b/kn-service/vordm-twitter/src/main/resources/application-prod.yaml new file mode 100644 index 0000000..e69de29 diff --git a/kn-service/vordm-twitter/src/main/resources/application.yaml b/kn-service/vordm-twitter/src/main/resources/application.yaml new file mode 100644 index 0000000..68512b0 --- /dev/null +++ b/kn-service/vordm-twitter/src/main/resources/application.yaml @@ -0,0 +1,12 @@ +server: + port: 8989 + +spring: + cloud: + gateway: + discovery: + locator: + enabled: true + loadbalancer: + retry: + enabled: true From 05fe6dd72faf9002ca16738fbb622ee02137d92f Mon Sep 17 00:00:00 2001 From: whq <460794335@qq.com> Date: Mon, 24 Apr 2023 19:28:56 +0800 Subject: [PATCH 2/5] Twitter --- kn-service/pom.xml | 1 + kn-service/vordm-twitter/Dockerfile | 2 +- kn-service/vordm-twitter/pom.xml | 54 +++++++++++++++++++ .../crawl/twitter/TwitterApplication.java | 12 +++-- .../src/main/resources/application-dev.yaml | 7 +++ .../src/main/resources/application.yaml | 2 +- 6 files changed, 73 insertions(+), 5 deletions(-) diff --git a/kn-service/pom.xml b/kn-service/pom.xml index e1b2c42..8406685 100644 --- a/kn-service/pom.xml +++ b/kn-service/pom.xml @@ -6,6 +6,7 @@ biz-vordm vordm-crawl + vordm-twitter diff --git a/kn-service/vordm-twitter/Dockerfile b/kn-service/vordm-twitter/Dockerfile index a8eeb9b..7fb149c 100644 --- a/kn-service/vordm-twitter/Dockerfile +++ b/kn-service/vordm-twitter/Dockerfile @@ -6,7 +6,7 @@ RUN mkdir -p /kn/vordm WORKDIR /kn/vordm -EXPOSE 8989 +EXPOSE 8987 ADD ./target/vordm-crawl.jar ./app.jar diff --git a/kn-service/vordm-twitter/pom.xml b/kn-service/vordm-twitter/pom.xml index 78ba4e5..9dbfdb2 100644 --- a/kn-service/vordm-twitter/pom.xml +++ b/kn-service/vordm-twitter/pom.xml @@ -17,4 +17,58 @@ UTF-8 + + + com.kening.platform + kn-launcher + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-undertow + + + wildfly-common + org.wildfly.common + + + + + com.itmuch + spring-cloud-wii + 2.2.6.RELEASE + + + de.codecentric + spring-boot-admin-starter-client + + + + org.springframework.cloud + spring-cloud-starter-netflix-hystrix + + + commons-logging + commons-logging + + + HdrHistogram + org.hdrhistogram + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + diff --git a/kn-service/vordm-twitter/src/main/java/com/kening/crawl/twitter/TwitterApplication.java b/kn-service/vordm-twitter/src/main/java/com/kening/crawl/twitter/TwitterApplication.java index 9822078..a86ca1c 100644 --- a/kn-service/vordm-twitter/src/main/java/com/kening/crawl/twitter/TwitterApplication.java +++ b/kn-service/vordm-twitter/src/main/java/com/kening/crawl/twitter/TwitterApplication.java @@ -1,7 +1,13 @@ -package com.kening.platform; +package com.kening.crawl.twitter; -public class Main { +import org.springblade.core.launch.BladeApplication; +import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.context.annotation.ComponentScan; + +@SpringCloudApplication +@ComponentScan({"org.springblade", "com.kening.crawl.twitter"}) +public class TwitterApplication { public static void main(String[] args) { - System.out.println("Hello world!"); + BladeApplication.run("vordm-twitter", TwitterApplication.class, args); } } diff --git a/kn-service/vordm-twitter/src/main/resources/application-dev.yaml b/kn-service/vordm-twitter/src/main/resources/application-dev.yaml index e69de29..93c68f9 100644 --- a/kn-service/vordm-twitter/src/main/resources/application-dev.yaml +++ b/kn-service/vordm-twitter/src/main/resources/application-dev.yaml @@ -0,0 +1,7 @@ +wii: + # 异构微服务的IP + ip: 78.46.158.237 + # 异构微服务的端口 + port: 7000 + # 异构微服务的健康检查URL + #health-check-route: /health diff --git a/kn-service/vordm-twitter/src/main/resources/application.yaml b/kn-service/vordm-twitter/src/main/resources/application.yaml index 68512b0..bd57f03 100644 --- a/kn-service/vordm-twitter/src/main/resources/application.yaml +++ b/kn-service/vordm-twitter/src/main/resources/application.yaml @@ -1,5 +1,5 @@ server: - port: 8989 + port: 8980 spring: cloud: From 890c26bfb5c959c18204aa024620575fda843339 Mon Sep 17 00:00:00 2001 From: whq <460794335@qq.com> Date: Mon, 24 Apr 2023 19:55:20 +0800 Subject: [PATCH 3/5] Twitter --- kn-service/vordm-twitter/Dockerfile | 2 +- .../vordm-twitter/src/main/resources/application-dev.yaml | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/kn-service/vordm-twitter/Dockerfile b/kn-service/vordm-twitter/Dockerfile index 7fb149c..457912a 100644 --- a/kn-service/vordm-twitter/Dockerfile +++ b/kn-service/vordm-twitter/Dockerfile @@ -6,7 +6,7 @@ RUN mkdir -p /kn/vordm WORKDIR /kn/vordm -EXPOSE 8987 +EXPOSE 8980 ADD ./target/vordm-crawl.jar ./app.jar diff --git a/kn-service/vordm-twitter/src/main/resources/application-dev.yaml b/kn-service/vordm-twitter/src/main/resources/application-dev.yaml index 93c68f9..e69de29 100644 --- a/kn-service/vordm-twitter/src/main/resources/application-dev.yaml +++ b/kn-service/vordm-twitter/src/main/resources/application-dev.yaml @@ -1,7 +0,0 @@ -wii: - # 异构微服务的IP - ip: 78.46.158.237 - # 异构微服务的端口 - port: 7000 - # 异构微服务的健康检查URL - #health-check-route: /health From 54ea3a9431f8b5a7c5ef680dd68cc2e0f75826b5 Mon Sep 17 00:00:00 2001 From: whq <460794335@qq.com> Date: Mon, 24 Apr 2023 19:58:10 +0800 Subject: [PATCH 4/5] Twitter --- kn-service/vordm-twitter/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kn-service/vordm-twitter/pom.xml b/kn-service/vordm-twitter/pom.xml index 9dbfdb2..01ce55a 100644 --- a/kn-service/vordm-twitter/pom.xml +++ b/kn-service/vordm-twitter/pom.xml @@ -5,7 +5,7 @@ kn-service com.kening.platform - 1.0.0-SNAPSHOT + ${revision} 4.0.0 From 9648ec944b8662ad2885706ac2f40f65bb5e2698 Mon Sep 17 00:00:00 2001 From: whq <460794335@qq.com> Date: Mon, 24 Apr 2023 19:59:47 +0800 Subject: [PATCH 5/5] Twitter --- kn-service/vordm-twitter/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kn-service/vordm-twitter/Dockerfile b/kn-service/vordm-twitter/Dockerfile index 457912a..d2ba668 100644 --- a/kn-service/vordm-twitter/Dockerfile +++ b/kn-service/vordm-twitter/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /kn/vordm EXPOSE 8980 -ADD ./target/vordm-crawl.jar ./app.jar +ADD ./target/vordm-twitter.jar ./app.jar ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]