From 5f9680c19bfb18a5f196ea7aaf290d1a883d9dc0 Mon Sep 17 00:00:00 2001 From: liulu Date: Mon, 30 Dec 2024 16:57:58 +0800 Subject: [PATCH] =?UTF-8?q?docker=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chsm/sdf/adapter/SdfApiAdapterFactory.java | 15 ++++++++++----- chsm-web-manage/Dockerfile | 6 +++--- chsm-web-manage/build.cmd | 4 ++-- chsm-web-manage/pom.xml | 2 +- chsm-web-server/Dockerfile | 8 ++++---- chsm-web-server/build.cmd | 4 ++-- chsm-web-server/pom.xml | 2 +- 7 files changed, 23 insertions(+), 18 deletions(-) diff --git a/chsm-common/src/main/java/com/sunyard/chsm/sdf/adapter/SdfApiAdapterFactory.java b/chsm-common/src/main/java/com/sunyard/chsm/sdf/adapter/SdfApiAdapterFactory.java index 098d225..cb11aa1 100644 --- a/chsm-common/src/main/java/com/sunyard/chsm/sdf/adapter/SdfApiAdapterFactory.java +++ b/chsm-common/src/main/java/com/sunyard/chsm/sdf/adapter/SdfApiAdapterFactory.java @@ -37,11 +37,16 @@ public class SdfApiAdapterFactory { // bc adaptor return BcSdfApiAdaptor.INSTANCE; } - switch (modelEnum) { - case enc001: - return Platform.isMac() ? getProxyRcpAdapter(ip, port) : new SunyardJnaSdfAdaptor(ip, port); - default: - throw new UnsupportedOperationException("不支持的设备型号: " + model); + try { + switch (modelEnum) { + case enc001: + return Platform.isMac() ? getProxyRcpAdapter(ip, port) : new SunyardJnaSdfAdaptor(ip, port); + default: + throw new UnsupportedOperationException("不支持的设备型号: " + model); + } + } catch (Throwable ex) { + log.warn("build SdfApiAdapter error", ex); + throw new IllegalArgumentException("build SdfApiAdapter error"); } } diff --git a/chsm-web-manage/Dockerfile b/chsm-web-manage/Dockerfile index 8643c59..b3b65df 100644 --- a/chsm-web-manage/Dockerfile +++ b/chsm-web-manage/Dockerfile @@ -1,13 +1,13 @@ -# FROM alibabadragonwell/dragonwell:8.28.21 +# FROM alibabadragonwell/dragonwell:8.20.21 FROM registry.cn-hangzhou.aliyuncs.com/fullstack/dragonwell8 WORKDIR /app -ADD target/chsm-manage.jar /app/chsm-manage.jar +ADD target/chsm-web-manager.jar /app/chsm-web-manager.jar ENV ENABLE_DEBUG=false ENV DEBUG_PORT=5005 EXPOSE 9880 # ENTRYPOINT ["insmod","/opt/driver/SJK1117-H/SJK1117_H.ko"] # ENTRYPOINT ["/bin/bash", "/opt/driver/SYD1308-G/install_driver.sh"] # ENTRYPOINT ["java","-jar","chsm-manage.jar"] -ENTRYPOINT ["/bin/bash", "-c", "if [ \"$ENABLE_DEBUG\" = \"true\" ]; then java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$DEBUG_PORT -jar chsm-manage.jar; else java -jar chsm-manage.jar; fi"] +ENTRYPOINT ["/bin/bash", "-c", "if [ \"$ENABLE_DEBUG\" = \"true\" ]; then java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$DEBUG_PORT -jar chsm-web-manager.jar; else java -jar chsm-web-manager.jar; fi"] diff --git a/chsm-web-manage/build.cmd b/chsm-web-manage/build.cmd index bc65c52..78dba63 100644 --- a/chsm-web-manage/build.cmd +++ b/chsm-web-manage/build.cmd @@ -8,10 +8,10 @@ del /S *.log call mvn clean -DskipTests=true package -f ../pom.xml echo ">>>>>>>>>>>begin build docker image ...<<<<<<<<<<<<<" -docker build -t chsm-manage:latest . +docker build -t chsm-web-manager:latest . echo ">>>>>>>>>>>build docker image success<<<<<<<<<<<<<" -docker save -o chsm-manage.tar chsm-manage:latest +docker save -o chsm-web-manager.tar chsm-web-manager:latest echo ">>>>>>>>>>>build docker offline tar success<<<<<<<<<<<<<" pause diff --git a/chsm-web-manage/pom.xml b/chsm-web-manage/pom.xml index 218a856..389a17b 100644 --- a/chsm-web-manage/pom.xml +++ b/chsm-web-manage/pom.xml @@ -118,7 +118,7 @@ - chsm-manage + chsm-web-manager org.springframework.boot diff --git a/chsm-web-server/Dockerfile b/chsm-web-server/Dockerfile index df12566..5b9a544 100644 --- a/chsm-web-server/Dockerfile +++ b/chsm-web-server/Dockerfile @@ -1,13 +1,13 @@ -# FROM alibabadragonwell/dragonwell:8.28.21 -FROM registry.cn-hangzhou.aliyuncs.com/fullstack/dragonwell8 +FROM alibabadragonwell/dragonwell:8.20.21 +# FROM registry.cn-hangzhou.aliyuncs.com/fullstack/dragonwell8 WORKDIR /app -ADD target/chsm-server.jar /app/chsm-server.jar +ADD target/chsm-web-server.jar /app/chsm-web-server.jar ENV ENABLE_DEBUG=false ENV DEBUG_PORT=5005 EXPOSE 9890 # ENTRYPOINT ["insmod","/opt/driver/SJK1117-H/SJK1117_H.ko"] # ENTRYPOINT ["/bin/bash", "/opt/driver/SYD1308-G/install_driver.sh"] # ENTRYPOINT ["java","-jar","chsm-manage.jar"] -ENTRYPOINT ["/bin/bash", "-c", "if [ \"$ENABLE_DEBUG\" = \"true\" ]; then java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$DEBUG_PORT -jar chsm-server.jar; else java -jar chsm-server.jar; fi"] +ENTRYPOINT ["/bin/bash", "-c", "if [ \"$ENABLE_DEBUG\" = \"true\" ]; then java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$DEBUG_PORT -jar chsm-web-server.jar; else java -jar chsm-web-server.jar; fi"] diff --git a/chsm-web-server/build.cmd b/chsm-web-server/build.cmd index aa6d04b..fa7dd38 100644 --- a/chsm-web-server/build.cmd +++ b/chsm-web-server/build.cmd @@ -8,10 +8,10 @@ del /S *.log call mvn clean -DskipTests=true package -f ../pom.xml echo ">>>>>>>>>>>begin build docker image ...<<<<<<<<<<<<<" -docker build -t chsm-server:latest . +docker build -t chsm-web-server:latest . echo ">>>>>>>>>>>build docker image success<<<<<<<<<<<<<" -docker save -o chsm-server.tar chsm-manage:latest +docker save -o chsm-web-server.tar chsm-web-server:latest echo ">>>>>>>>>>>build docker offline tar success<<<<<<<<<<<<<" pause diff --git a/chsm-web-server/pom.xml b/chsm-web-server/pom.xml index 0add2e0..254f064 100644 --- a/chsm-web-server/pom.xml +++ b/chsm-web-server/pom.xml @@ -44,7 +44,7 @@ - chsm-server + chsm-web-server org.springframework.boot