diff --git a/Dockerfile-gz b/Dockerfile-gz index 69d55f9..abe3ef6 100644 --- a/Dockerfile-gz +++ b/Dockerfile-gz @@ -4,4 +4,4 @@ ENV LANG=zh_CN.utf8 ENV LANGUAGE=zh_CN.utf8 RUN localedef -c -f UTF-8 -i zh_CN zh_CN.utf8 ADD /target/biz_service_ebtp_project-0.0.1.jar /biz_service_ebtp_project-0.0.1.jar -ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/biz_service_ebtp_project-0.0.1.jar"] +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=uat", "-jar", "/biz_service_ebtp_project-0.0.1.jar"] diff --git a/Dockerfile-test b/Dockerfile-test new file mode 100644 index 0000000..0646be2 --- /dev/null +++ b/Dockerfile-test @@ -0,0 +1,7 @@ +FROM harbor.dcos.guangzhou.unicom.local/eshop/skywalking_agent_springboot_8.1.0:v1.0 +ENV LC_ALL=zh_CN.utf8 +ENV LANG=zh_CN.utf8 +ENV LANGUAGE=zh_CN.utf8 +RUN localedef -c -f UTF-8 -i zh_CN zh_CN.utf8 +ADD /target/biz_service_ebtp_project-0.0.1.jar /biz_service_ebtp_project-0.0.1.jar +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=test", "-jar", "/biz_service_ebtp_project-0.0.1.jar"] diff --git a/config-test b/config-test new file mode 100644 index 0000000..27abdb5 --- /dev/null +++ b/config-test @@ -0,0 +1,17 @@ +apiVersion: v1 +clusters: +- cluster: + insecure-skip-tls-verify: true + server: https://10.125.164.54:41967 + name: demok8s +contexts: +- context: + cluster: demok8s + user: cluster-admin + name: default +current-context: default +kind: Config +users: +- name: cluster-admin + user: + token: b69792983bfe0ec502e081ad8a31f9e2 \ No newline at end of file diff --git a/deployment-test.yaml b/deployment-test.yaml new file mode 100644 index 0000000..0cb2ef1 --- /dev/null +++ b/deployment-test.yaml @@ -0,0 +1,71 @@ +# 接口版本 +apiVersion: apps/v1 +# 接口类型 +kind: Deployment +metadata: + name: biz-service-ebtp-project + namespace: default + labels: + app: biz-service-ebtp-project + +# 必选,详细定义 +spec: + # pod 副本数量 + replicas: 1 + + # 滚动升级配置信息 + strategy: + rollingUpdate: + maxSurge: 1 + maxUnavailable: 1 + + # 选择器,匹配pod模板 + selector: + matchLabels: + app: biz-service-ebtp-project + + template: + metadata: + labels: + # 模板名称 + app: biz-service-ebtp-project + annotations: + prometheus.io/port: '18012' + prometheus.io/jl-pod: 'true' + + # 定义容器模板,该模板可以包含多个容器 + spec: + # 必选,Pod中容器列表 + containers: + - name: biz-service-ebtp-project + image: harbor.dcos.guangzhou.unicom.local/eshop/biz-service-ebtp-project:latest + # 需要暴露的端口库号列表 + ports: + - containerPort: 18012 + # 容器运行前需设置的环境变量列表 + env: + # Apollo 配置中心变量设置 + - name: APOLLO_CONFIGSERVICE + value: http://10.242.37.148:6001 +--- +kind: Service +apiVersion: v1 +metadata: + name: biz-service-ebtp-project + namespace: default + labels: + app: biz-service-ebtp-project + annotations: + lb.cke.tg.unicom/target-vports: 18012-18012 + prometheus.io/port: '18012' + prometheus.io/jl-svc: 'true' +spec: + ports: + - port: 18012 + targetPort: 18012 + selector: + app: biz-service-ebtp-project +status: + loadBalancer: {} + +--- \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index 4e961cd..684d3ca 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -155,6 +155,10 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl