From 9a728e10e6b4fa5b13489f4bc28fe2a136ea36c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A6=8F=E8=B4=A2?= <1471584931@qq.com> Date: Wed, 22 Oct 2025 20:30:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=87=BD=E6=95=B0=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E6=B5=8B=E8=AF=95=E7=B1=BB=EF=BC=8C=E8=B0=83=E6=95=B4?= =?UTF-8?q?.sh=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/common/db/service/CommonCallService.java | 2 +- itc-pcitc-mdm/itc-pcitc-mdm-start/pom.xml | 10 +--------- .../itc-pcitc-mdm-start/src/main/docker/Dockerfile | 6 +++--- .../itc-pcitc-mdm-start/src/main/docker/docker-mdm.sh | 2 +- .../itc-pcitc-mdm-start/src/main/docker/startApp.sh | 4 ++-- .../src/test/java/com/xjrsoft/test/CallTest.java | 5 +++++ 6 files changed, 13 insertions(+), 16 deletions(-) create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-start/src/test/java/com/xjrsoft/test/CallTest.java diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/common/db/service/CommonCallService.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/common/db/service/CommonCallService.java index c42e77e..116d037 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/common/db/service/CommonCallService.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/common/db/service/CommonCallService.java @@ -35,7 +35,7 @@ public class CommonCallService { * @param id 表主键 * @return String 返回类型 函数返回非空、或者数据库异常时rollback，函数返回空时commit； */ - public String saveAfter(String table,Long id) { + public String saveAfter(String table,long id) { String sql = StringUtils.format("{? = call pc_{0}.f_save(?)}",table); List params = ListUtils.newArrayList(JdbcParam.ofLong(id)); JdbcParam outParam = JdbcParam.ofString(null).setOut(true); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-start/pom.xml b/itc-pcitc-mdm/itc-pcitc-mdm-start/pom.xml index 07128d4..a2e25d9 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-start/pom.xml +++ b/itc-pcitc-mdm/itc-pcitc-mdm-start/pom.xml @@ -106,15 +106,7 @@ src/main/resources - **/*.yml - **/*.properties - **/*.xml - **/*.vm - **/*.ftl - **/*.jpg - **/*.png - **/*.xls - **/*.xlsx + **/* false diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/docker/Dockerfile b/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/docker/Dockerfile index b7c3951..1b7cc9d 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/docker/Dockerfile +++ b/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ #FROM --platform=linux/arm64 docker.ges.bjgastx.com/openjdk-arm64:8-jre -FROM docker.ges.bjgastx.com/jdk8u112:v1 +FROM jdk8u112:v1 RUN mkdir -p /root/logs/java/ \ @@ -23,9 +23,9 @@ ARG PRO_FILE ARG SOURCE_NAME ADD ./startApp.sh /opt/app/ -RUN chmod u+x /opt/app/*.sh +RUN chmod u+x /opt/app/startApp.sh ADD ./${SOURCE_NAME} /opt/app/app.jar -RUN test -f /opt/app/app.jar || { echo "Error: JAR file not found at ${SOURCE_NAME}"; exit 1; } +#RUN test -f /opt/app/app.jar || { echo "Error: JAR file not found at ${SOURCE_NAME}"; exit 1; } #应用名称 ENV APP_NAME=itc-pcitc-mdm diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/docker/docker-mdm.sh b/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/docker/docker-mdm.sh index aef3758..9be2f03 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/docker/docker-mdm.sh +++ b/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/docker/docker-mdm.sh @@ -3,7 +3,7 @@ # 定义变量 CONTAINER_NAME="itc-pcitc-mdm" IMAGE_NAME="10.10.2.102/itc-pcitc-mdm" -IMAGE_VERSION="2025-08-04-0940" +IMAGE_VERSION="2025-10-22-0851" IMAGE_FULL="$IMAGE_NAME:$IMAGE_VERSION" PORT=8096 # 服务暴露端口 CONTAINER_PORT=8096 # 服务暴露端口 diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/docker/startApp.sh b/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/docker/startApp.sh index 7c0b24c..b5d03f6 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/docker/startApp.sh +++ b/itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/docker/startApp.sh @@ -31,8 +31,8 @@ else export JAVA_OPTS="$JAVA_OPTS -XX:+CMSParallelRemarkEnabled -XX:+CMSClassUnloadingEnabled -XX:CMSMaxAbortablePrecleanTime=5000" export JAVA_OPTS="$JAVA_OPTS -XX:CMSInitiatingOccupancyFraction=80 -XX:+UseCMSInitiatingOccupancyOnly" export JAVA_OPTS="$JAVA_OPTS -verbose:gc -Xloggc:./logs/gc.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps" - # 开发环境开启远程调试 - #export JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" + # 开发环境开启远程调试 + # export JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" fi # 公共配置（编码、时区等） diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-start/src/test/java/com/xjrsoft/test/CallTest.java b/itc-pcitc-mdm/itc-pcitc-mdm-start/src/test/java/com/xjrsoft/test/CallTest.java new file mode 100644 index 0000000..7fca435 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-start/src/test/java/com/xjrsoft/test/CallTest.java @@ -0,0 +1,5 @@ +package com.xjrsoft.test; + +public class CallTest { + +}