Merge branch 'refs/heads/container' into container-prod

# Conflicts:
#	liquidnet-bus-support/liquidnet-support-config/src/main/resources/application-dev.yml

docker-entrypoint.sh

+#!/bin/sh
+set -e
+
+if [ -z "$SERVICE_NAME" ]; then
+  echo "ERROR: SERVICE_NAME environment variable is not set"
+  exit 1
+fi
+
+if [ -z "$APP_JAR" ]; then
+  echo "ERROR: APP_JAR environment variable is not set"
+  exit 1
+fi
+
+echo "Building OpenTelemetry Resource Attributes..."
+
+RESOURCE_ATTRS="service.name=${SERVICE_NAME}"
+
+if [ -n "$SERVICE_VERSION" ] && [ "$SERVICE_VERSION" != "unknown" ]; then
+  RESOURCE_ATTRS="${RESOURCE_ATTRS},service.version=${SERVICE_VERSION}"
+fi
+
+RESOURCE_ATTRS="${RESOURCE_ATTRS},host.name=${HOSTNAME:-unknown}"
+RESOURCE_ATTRS="${RESOURCE_ATTRS},host.ip=${POD_IP:-unknown}"
+
+RESOURCE_ATTRS="${RESOURCE_ATTRS},k8s.pod.name=${POD_NAME:-unknown}"
+RESOURCE_ATTRS="${RESOURCE_ATTRS},k8s.namespace.name=${POD_NAMESPACE:-unknown}"
+
+if [ -n "$POD_NAMESPACE" ] && [ "$POD_NAMESPACE" != "unknown" ]; then
+  RESOURCE_ATTRS="${RESOURCE_ATTRS},deployment.environment=${POD_NAMESPACE}"
+fi
+
+if [ -n "$OTEL_RESOURCE_ATTRS_EXTRA" ]; then
+  RESOURCE_ATTRS="${RESOURCE_ATTRS},${OTEL_RESOURCE_ATTRS_EXTRA}"
+  echo "Extra attributes added: $OTEL_RESOURCE_ATTRS_EXTRA"
+fi
+
+echo "Service Name: ${SERVICE_NAME}"
+echo "Service Version: ${SERVICE_VERSION:-unknown}"
+echo "App JAR: ${APP_JAR}"
+echo "Resource Attributes: ${RESOURCE_ATTRS}"
+echo "Starting application..."
+
+exec java \
+  -javaagent:/app/opentelemetry-javaagent.jar \
+  -Dotel.resource.attributes="${RESOURCE_ATTRS}" \
+  ${OTEL_JAVA_OPTS} \
+  -jar "${APP_JAR}"
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/Dockerfile.admin

-#FROM openjdk/arm64:8u302-jdk
 FROM registry.cn-beijing.aliyuncs.com/zhengzai-base/jdk:8u302
-# 设置时区为中国标准时间 (CST)
+
+ARG VERSION=1.0.0
+
 ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-COPY target/liquidnet-client-admin-web.jar /
+
+COPY opentelemetry-javaagent.jar /app/opentelemetry-javaagent.jar
+COPY docker-entrypoint.sh /app/docker-entrypoint.sh
+RUN chmod +x /app/docker-entrypoint.sh
+
+COPY liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/target/liquidnet-client-admin-web.jar /app/liquidnet-client-admin-web.jar
+
 EXPOSE 7099
-#ENTRYPOINT exec java $JAVA_OPTS -jar /liquidnet-client-admin-web.jar
-#ENTRYPOINT ["java", "-Xms4096m", "-Xmx4096m", "-jar", "/liquidnet-client-admin-web.jar"]
-ENTRYPOINT ["java", "-jar", "/liquidnet-client-admin-web.jar"]
 
-# docker buildx build --platform linux/amd64 -t liquidnet-client-admin:amd2.0 --load -f Dockerfile.admin .
-# docker tag liquidnet-client-admin:amd2.0 registry.cn-beijing.aliyuncs.com/zhengzai-backend/admin-test:2.0
-# docker push registry.cn-beijing.aliyuncs.com/zhengzai-backend/admin-test:2.0
\ No newline at end of file
+ENV SERVICE_NAME=admin-web
+ENV SERVICE_VERSION=${VERSION}
+ENV APP_JAR=/app/liquidnet-client-admin-web.jar
+ENV OTEL_JAVA_OPTS="-Dotel.traces.exporter=none -Dotel.metrics.exporter=none -Dotel.logs.exporter=none"
+
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-job/Dockerfile.client-job

 FROM registry.cn-beijing.aliyuncs.com/zhengzai-base/jdk:8u302
 
-# 设置时区为中国标准时间 (CST)
+ARG VERSION=1.0.0
+
 ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-COPY target/liquidnet-client-job.jar /
+COPY opentelemetry-javaagent.jar /app/opentelemetry-javaagent.jar
+COPY docker-entrypoint.sh /app/docker-entrypoint.sh
+RUN chmod +x /app/docker-entrypoint.sh
+
+COPY liquidnet-bus-client/liquidnet-client-job/target/liquidnet-client-job.jar /app/liquidnet-client-job.jar
+
 EXPOSE 8090
-ENTRYPOINT ["java", "-jar", "/liquidnet-client-job.jar"]
\ No newline at end of file
+
+ENV SERVICE_NAME=client-job
+ENV SERVICE_VERSION=${VERSION}
+ENV APP_JAR=/app/liquidnet-client-job.jar
+ENV OTEL_JAVA_OPTS="-Dotel.traces.exporter=none -Dotel.metrics.exporter=none -Dotel.logs.exporter=none"
+
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/Dockerfile.adam

 FROM registry.cn-beijing.aliyuncs.com/zhengzai-base/jdk:8u302
-# 设置时区为中国标准时间 (CST)
+
+ARG VERSION=1.0.0
+
 ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-COPY target/liquidnet-service-adam-impl.jar /
+
+COPY opentelemetry-javaagent.jar /app/opentelemetry-javaagent.jar
+COPY docker-entrypoint.sh /app/docker-entrypoint.sh
+RUN chmod +x /app/docker-entrypoint.sh
+
+COPY liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/target/liquidnet-service-adam-impl.jar /app/liquidnet-service-adam-impl.jar
+
 EXPOSE 9001
-ENTRYPOINT ["java", "-jar", "/liquidnet-service-adam-impl.jar"]
 
+ENV SERVICE_NAME=adam
+ENV SERVICE_VERSION=${VERSION}
+ENV APP_JAR=/app/liquidnet-service-adam-impl.jar
+ENV OTEL_JAVA_OPTS="-Dotel.traces.exporter=none -Dotel.metrics.exporter=none -Dotel.logs.exporter=none"
+
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/Dockerfile.candy

 FROM registry.cn-beijing.aliyuncs.com/zhengzai-base/jdk:8u302
-#FROM openjdk:8-jdk
 
-# 设置时区为中国标准时间 (CST)
+ARG VERSION=1.0.0
+
 ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-COPY target/liquidnet-service-candy-impl.jar /
+COPY opentelemetry-javaagent.jar /app/opentelemetry-javaagent.jar
+COPY docker-entrypoint.sh /app/docker-entrypoint.sh
+RUN chmod +x /app/docker-entrypoint.sh
+
+COPY liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/target/liquidnet-service-candy-impl.jar /app/liquidnet-service-candy-impl.jar
+
 EXPOSE 9009
-#ENTRYPOINT ["java", "-Dspring.profiles.active=test", "-jar", "/app/liquidnet-service-candy-impl.jar"]
-ENTRYPOINT ["java","-jar", "/liquidnet-service-candy-impl.jar"]
+
+ENV SERVICE_NAME=candy
+ENV SERVICE_VERSION=${VERSION}
+ENV APP_JAR=/app/liquidnet-service-candy-impl.jar
+ENV OTEL_JAVA_OPTS="-Dotel.traces.exporter=none -Dotel.metrics.exporter=none -Dotel.logs.exporter=none"
+
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/Dockerfile.chime

 FROM registry.cn-beijing.aliyuncs.com/zhengzai-base/jdk:8u302
-#FROM openjdk:8-jdk
 
-# 设置时区为中国标准时间 (CST)
+ARG VERSION=1.0.0
+
 ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-COPY target/liquidnet-service-chime-impl.jar /
+COPY opentelemetry-javaagent.jar /app/opentelemetry-javaagent.jar
+COPY docker-entrypoint.sh /app/docker-entrypoint.sh
+RUN chmod +x /app/docker-entrypoint.sh
+
+COPY liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/target/liquidnet-service-chime-impl.jar /app/liquidnet-service-chime-impl.jar
+
 EXPOSE 9011
-#ENTRYPOINT ["java", "-Dspring.profiles.active=test", "-jar", "/app/liquidnet-service-chime-impl.jar"]
-ENTRYPOINT ["java", "-jar", "/liquidnet-service-chime-impl.jar"]
+
+ENV SERVICE_NAME=chime
+ENV SERVICE_VERSION=${VERSION}
+ENV APP_JAR=/app/liquidnet-service-chime-impl.jar
+ENV OTEL_JAVA_OPTS="-Dotel.traces.exporter=none -Dotel.metrics.exporter=none -Dotel.logs.exporter=none"
+
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-base/Dockerfile.consumer-base

 FROM registry.cn-beijing.aliyuncs.com/zhengzai-base/jdk:8u302
-#FROM openjdk:8-jdk
 
-# 设置时区为中国标准时间 (CST)
+ARG VERSION=1.0.0
+
 ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-COPY target/liquidnet-service-consumer-base.jar /
+COPY opentelemetry-javaagent.jar /app/opentelemetry-javaagent.jar
+COPY docker-entrypoint.sh /app/docker-entrypoint.sh
+RUN chmod +x /app/docker-entrypoint.sh
+
+COPY liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-base/target/liquidnet-service-consumer-base.jar /app/liquidnet-service-consumer-base.jar
+
 EXPOSE 9989
-#ENTRYPOINT ["java", "-Dspring.profiles.active=test", "-jar", "/app/liquidnet-service-consumer-base.jar"]
-ENTRYPOINT ["java",  "-jar", "/liquidnet-service-consumer-base.jar"]
 
+ENV SERVICE_NAME=consumer-base
+ENV SERVICE_VERSION=${VERSION}
+ENV APP_JAR=/app/liquidnet-service-consumer-base.jar
+ENV OTEL_JAVA_OPTS="-Dotel.traces.exporter=none -Dotel.metrics.exporter=none -Dotel.logs.exporter=none"
+
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-order/Dockerfile.consumer-order

 FROM registry.cn-beijing.aliyuncs.com/zhengzai-base/jdk:8u302
-#FROM openjdk:8-jdk
 
-# 设置时区为中国标准时间 (CST)
+ARG VERSION=1.0.0
+
 ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-COPY target/liquidnet-service-consumer-order.jar /
+COPY opentelemetry-javaagent.jar /app/opentelemetry-javaagent.jar
+COPY docker-entrypoint.sh /app/docker-entrypoint.sh
+RUN chmod +x /app/docker-entrypoint.sh
+
+COPY liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-order/target/liquidnet-service-consumer-order.jar /app/liquidnet-service-consumer-order.jar
+
 EXPOSE 9993
-#ENTRYPOINT ["java", "-Dspring.profiles.active=test", "-jar", "/app/liquidnet-service-consumer-order.jar"]
-ENTRYPOINT ["java", "-jar", "/liquidnet-service-consumer-order.jar"]
+
+ENV SERVICE_NAME=consumer-order
+ENV SERVICE_VERSION=${VERSION}
+ENV APP_JAR=/app/liquidnet-service-consumer-order.jar
+ENV OTEL_JAVA_OPTS="-Dotel.traces.exporter=none -Dotel.metrics.exporter=none -Dotel.logs.exporter=none"
+
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/Dockerfile.executor-main

 FROM registry.cn-beijing.aliyuncs.com/zhengzai-base/jdk:8u302
-#FROM openjdk:8-jdk
 
-# 设置时区为中国标准时间 (CST)
+ARG VERSION=1.0.0
+
 ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-COPY target/liquidnet-service-executor-main.jar /
+COPY opentelemetry-javaagent.jar /app/opentelemetry-javaagent.jar
+COPY docker-entrypoint.sh /app/docker-entrypoint.sh
+RUN chmod +x /app/docker-entrypoint.sh
+
+COPY liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/target/liquidnet-service-executor-main.jar /app/liquidnet-service-executor-main.jar
+
 EXPOSE 8190
-#ENTRYPOINT ["java", "-Dspring.profiles.active=test", "-jar", "/app/liquidnet-service-executor-main.jar"]
-ENTRYPOINT ["java","-jar", "/liquidnet-service-executor-main.jar"]
 
+ENV SERVICE_NAME=executor-main
+ENV SERVICE_VERSION=${VERSION}
+ENV APP_JAR=/app/liquidnet-service-executor-main.jar
+ENV OTEL_JAVA_OPTS="-Dotel.traces.exporter=none -Dotel.metrics.exporter=none -Dotel.logs.exporter=none"
+
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/Dockerfile.goblin

 FROM registry.cn-beijing.aliyuncs.com/zhengzai-base/jdk:8u302
-#FROM openjdk:8-jdk
 
-# 设置时区为中国标准时间 (CST)
+ARG VERSION=1.0.0
+
 ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-COPY target/liquidnet-service-goblin-impl.jar /
+COPY opentelemetry-javaagent.jar /app/opentelemetry-javaagent.jar
+COPY docker-entrypoint.sh /app/docker-entrypoint.sh
+RUN chmod +x /app/docker-entrypoint.sh
+
+COPY liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/target/liquidnet-service-goblin-impl.jar /app/liquidnet-service-goblin-impl.jar
+
 EXPOSE 9014
-#ENTRYPOINT ["java", "-Dspring.profiles.active=test", "-jar", "/app/liquidnet-service-goblin-impl.jar"]
-ENTRYPOINT ["java", "-jar", "/liquidnet-service-goblin-impl.jar"]
 
+ENV SERVICE_NAME=goblin
+ENV SERVICE_VERSION=${VERSION}
+ENV APP_JAR=/app/liquidnet-service-goblin-impl.jar
+ENV OTEL_JAVA_OPTS="-Dotel.traces.exporter=none -Dotel.metrics.exporter=none -Dotel.logs.exporter=none"
+
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinRechargeWristbandServiceImpl.java

@@ -292,7 +292,7 @@ public class GoblinRechargeWristbandServiceImpl extends ServiceImpl<GoblinRechar
                         sqls.add(SqlMapping.get("goblin_bracelet_order_update_refund"));
                         LinkedList<Object[]> sqlDataOrder = CollectionUtil.linkedListObjectArr();
                         sqlDataOrder.add(new Object[]{
-                                orderVo.getStatus(), orderVo.getRefundStatus(), orderVo.getRefundStatusNote(), LocalDateTime.now()
+                                orderVo.getStatus(), orderVo.getRefundStatus(), orderVo.getRefundStatusNote(), LocalDateTime.now(), orderId
                         });
                         queueUtils.sendMsgByRedis(
                                 MQConst.GoblinQueue.GOBLIN_NFT_ORDER.getKey(),

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/Dockerfile.kylin

 FROM registry.cn-beijing.aliyuncs.com/zhengzai-base/jdk:8u302
-#FROM openjdk:8-jdk
 
-# 设置时区为中国标准时间 (CST)
+ARG VERSION=1.0.0
+
 ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-COPY target/liquidnet-service-kylin-impl.jar /app/liquidnet-service-kylin-impl.jar
+COPY opentelemetry-javaagent.jar /app/opentelemetry-javaagent.jar
+COPY docker-entrypoint.sh /app/docker-entrypoint.sh
+RUN chmod +x /app/docker-entrypoint.sh
+
+COPY liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/target/liquidnet-service-kylin-impl.jar /app/liquidnet-service-kylin-impl.jar
+
 EXPOSE 9002
-ENTRYPOINT ["java", "-jar", "/app/liquidnet-service-kylin-impl.jar"]
 
+ENV SERVICE_NAME=kylintest
+ENV SERVICE_VERSION=${VERSION}
+ENV APP_JAR=/app/liquidnet-service-kylin-impl.jar
+ENV OTEL_JAVA_OPTS="-Dotel.traces.exporter=none -Dotel.metrics.exporter=none -Dotel.logs.exporter=none"
+
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/Dockerfile.order

 FROM registry.cn-beijing.aliyuncs.com/zhengzai-base/jdk:8u302
-#FROM openjdk:8-jdk
 
-# 设置时区为中国标准时间 (CST)
+ARG VERSION=1.0.0
+
 ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-COPY target/liquidnet-service-order-impl.jar /
+COPY opentelemetry-javaagent.jar /app/opentelemetry-javaagent.jar
+COPY docker-entrypoint.sh /app/docker-entrypoint.sh
+RUN chmod +x /app/docker-entrypoint.sh
+
+COPY liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/target/liquidnet-service-order-impl.jar /app/liquidnet-service-order-impl.jar
+
 EXPOSE 9004
-#ENTRYPOINT ["java", "-Dspring.profiles.active=test", "-jar", "/app/liquidnet-service-order-impl.jar"]
-ENTRYPOINT ["java","-jar", "/liquidnet-service-order-impl.jar"]
 
+ENV SERVICE_NAME=order
+ENV SERVICE_VERSION=${VERSION}
+ENV APP_JAR=/app/liquidnet-service-order-impl.jar
+ENV OTEL_JAVA_OPTS="-Dotel.traces.exporter=none -Dotel.metrics.exporter=none -Dotel.logs.exporter=none"
+
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/Dockerfile.platform

-#FROM openjdk/arm64:8u302-jdk
 FROM registry.cn-beijing.aliyuncs.com/zhengzai-base/jdk:8u302
-# 设置时区为中国标准时间 (CST)
+
+ARG VERSION=1.0.0
+
 ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-COPY target/liquidnet-service-platform-impl.jar /
+
+COPY opentelemetry-javaagent.jar /app/opentelemetry-javaagent.jar
+COPY docker-entrypoint.sh /app/docker-entrypoint.sh
+RUN chmod +x /app/docker-entrypoint.sh
+
+COPY liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/target/liquidnet-service-platform-impl.jar /app/liquidnet-service-platform-impl.jar
+
 EXPOSE 9003
-#ENTRYPOINT exec java $JAVA_OPTS -jar /liquidnet-service-platform-impl.jar
-#ENTRYPOINT ["java", "-Dspring.profiles.active=test", "-XX:MetaspaceSize=256m", "-XX:MaxMetaspaceSize=256m", "-Xms4096m", "-Xmx6100m", "-XX:+UseParallelGC", "-XX:ParallelGCThreads=20", "-jar", "/liquidnet-service-platform-impl.jar"]
-ENTRYPOINT ["java", "-jar", "/liquidnet-service-platform-impl.jar"]
 
-# docker buildx build --platform linux/amd64 -t liquidnet-service-platform:amd2.0 --load -f Dockerfile.platform .
-# docker tag liquidnet-service-platform:amd2.0 registry.cn-beijing.aliyuncs.com/zhengzai-backend/platform-test:2.0
-# docker push registry.cn-beijing.aliyuncs.com/zhengzai-backend/platform-test:2.0
\ No newline at end of file
+ENV SERVICE_NAME=platform
+ENV SERVICE_VERSION=${VERSION}
+ENV APP_JAR=/app/liquidnet-service-platform-impl.jar
+ENV OTEL_JAVA_OPTS="-Dotel.traces.exporter=none -Dotel.metrics.exporter=none -Dotel.logs.exporter=none"
+
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-slime/liquidnet-service-slime-impl/Dockerfile.slime

-#FROM openjdk/arm64:8u302-jdk
 FROM registry.cn-beijing.aliyuncs.com/zhengzai-base/jdk:8u302
-# 设置时区为中国标准时间 (CST)
+
+ARG VERSION=1.0.0
+
 ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-COPY target/liquidnet-service-slime-impl.jar /
+
+COPY opentelemetry-javaagent.jar /app/opentelemetry-javaagent.jar
+COPY docker-entrypoint.sh /app/docker-entrypoint.sh
+RUN chmod +x /app/docker-entrypoint.sh
+
+COPY liquidnet-bus-service/liquidnet-service-slime/liquidnet-service-slime-impl/target/liquidnet-service-slime-impl.jar /app/liquidnet-service-slime-impl.jar
+
 EXPOSE 9013
-#ENTRYPOINT exec java $JAVA_OPTS -jar /liquidnet-service-slime-impl.jar
-#ENTRYPOINT ["java", "-Dspring.profiles.active=test", "-XX:MetaspaceSize=256m", "-XX:MaxMetaspaceSize=256m", "-Xms4096m", "-Xmx6100m", "-XX:+UseParallelGC", "-XX:ParallelGCThreads=20", "-jar", "/liquidnet-service-slime-impl.jar"]
-ENTRYPOINT ["java", "-jar", "/liquidnet-service-slime-impl.jar"]
 
-# docker buildx build --platform linux/amd64 -t liquidnet-service-slime:amd2.0 --load -f Dockerfile.slime .
-# docker tag liquidnet-service-slime:amd2.0 registry.cn-beijing.aliyuncs.com/zhengzai-backend/slime-test:2.0
-# docker push registry.cn-beijing.aliyuncs.com/zhengzai-backend/slime-test:2.0
\ No newline at end of file
+ENV SERVICE_NAME=slime
+ENV SERVICE_VERSION=${VERSION}
+ENV APP_JAR=/app/liquidnet-service-slime-impl.jar
+ENV OTEL_JAVA_OPTS="-Dotel.traces.exporter=none -Dotel.metrics.exporter=none -Dotel.logs.exporter=none"
+
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/Dockerfile.smile

-#FROM openjdk/arm64:8u302-jdk
 FROM registry.cn-beijing.aliyuncs.com/zhengzai-base/jdk:8u302
-# 设置时区为中国标准时间 (CST)
+
+ARG VERSION=1.0.0
+
 ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-COPY target/liquidnet-service-smile-impl.jar /
+
+COPY opentelemetry-javaagent.jar /app/opentelemetry-javaagent.jar
+COPY docker-entrypoint.sh /app/docker-entrypoint.sh
+RUN chmod +x /app/docker-entrypoint.sh
+
+COPY liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/target/liquidnet-service-smile-impl.jar /app/liquidnet-service-smile-impl.jar
+
 EXPOSE 9015
-#ENTRYPOINT exec java $JAVA_OPTS -jar /liquidnet-service-smile-impl.jar
-#ENTRYPOINT ["java", "-Dspring.profiles.active=test", "-XX:MetaspaceSize=256m", "-XX:MaxMetaspaceSize=256m", "-Xms3072m", "-Xmx5120m", "-XX:+UseParallelGC", "-XX:ParallelGCThreads=20", "-jar", "/liquidnet-service-smile-impl.jar"]
-ENTRYPOINT ["java", "-jar", "/liquidnet-service-smile-impl.jar"]
 
-# docker buildx build --platform linux/amd64 -t liquidnet-service-smile:amd2.0 --load -f Dockerfile.smile .
-# docker tag liquidnet-service-smile:amd2.0 registry.cn-beijing.aliyuncs.com/zhengzai-backend/smile-test:2.0
-# docker push registry.cn-beijing.aliyuncs.com/zhengzai-backend/smile-test:2.0
\ No newline at end of file
+ENV SERVICE_NAME=smile
+ENV SERVICE_VERSION=${VERSION}
+ENV APP_JAR=/app/liquidnet-service-smile-impl.jar
+ENV OTEL_JAVA_OPTS="-Dotel.traces.exporter=none -Dotel.metrics.exporter=none -Dotel.logs.exporter=none"
+
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/Dockerfile.stone

 FROM registry.cn-beijing.aliyuncs.com/zhengzai-base/jdk:8u302
-#FROM openjdk:8-jdk
 
-# 设置时区为中国标准时间 (CST)
+ARG VERSION=1.0.0
+
 ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-COPY target/liquidnet-service-stone-impl.jar /
+COPY opentelemetry-javaagent.jar /app/opentelemetry-javaagent.jar
+COPY docker-entrypoint.sh /app/docker-entrypoint.sh
+RUN chmod +x /app/docker-entrypoint.sh
+
+COPY liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/target/liquidnet-service-stone-impl.jar /app/liquidnet-service-stone-impl.jar
+
 EXPOSE 9010
-#ENTRYPOINT ["java", "-Dspring.profiles.active=test", "-jar", "/app/liquidnet-service-stone-impl.jar"]
-ENTRYPOINT ["java", "-jar", "/liquidnet-service-stone-impl.jar"]
 
+ENV SERVICE_NAME=stone
+ENV SERVICE_VERSION=${VERSION}
+ENV APP_JAR=/app/liquidnet-service-stone-impl.jar
+ENV OTEL_JAVA_OPTS="-Dotel.traces.exporter=none -Dotel.metrics.exporter=none -Dotel.logs.exporter=none"
+
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-sweet/Dockerfile.sweet

 FROM registry.cn-beijing.aliyuncs.com/zhengzai-base/jdk:8u302
 
-# 设置时区为中国标准时间 (CST)
+ARG VERSION=1.0.0
+
 ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-COPY target/liquidnet-service-sweet.jar /
+COPY opentelemetry-javaagent.jar /app/opentelemetry-javaagent.jar
+COPY docker-entrypoint.sh /app/docker-entrypoint.sh
+RUN chmod +x /app/docker-entrypoint.sh
+
+COPY liquidnet-bus-service/liquidnet-service-sweet/target/liquidnet-service-sweet.jar /app/liquidnet-service-sweet.jar
+
 EXPOSE 9008
-ENTRYPOINT ["java", "-jar", "/liquidnet-service-sweet.jar"]
 
+ENV SERVICE_NAME=sweet
+ENV SERVICE_VERSION=${VERSION}
+ENV APP_JAR=/app/liquidnet-service-sweet.jar
+ENV OTEL_JAVA_OPTS="-Dotel.traces.exporter=none -Dotel.metrics.exporter=none -Dotel.logs.exporter=none"
+
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
\ No newline at end of file

liquidnet-bus-support/liquidnet-support-config/src/main/resources/application-dev.yml

@@ -20,8 +20,8 @@ liquidnet:
 #    username: admin
 #    password: admin
   config:
-#    location: /Users/hujiachen/IdeaProjects/liquidnet-bus-v1/liquidnet-bus-config/liquidnet-config
-    location: /Users/jiangxiulong/IdeaProjects/liquidnet-bus-v1/liquidnet-bus-config/liquidnet-config
+#    location: /Users/jiangxiulong/IdeaProjects/liquidnet-bus-v1/liquidnet-bus-config/liquidnet-config
+    location: /app/support-config
 # end-dev-这里是配置信息基本值
 
 spring: