Browse Source

Merge branch 'develop' of http://39.106.8.246:3003/BDTP/digital-delivery

zhaoyk 3 years ago
parent
commit
a5f3264270

+ 2 - 5
adm-business/adm-diagram/src/main/resources/bootstrap.yml

@@ -3,7 +3,7 @@ server:
 spring:
   application:
     # 应用名称
-    name: dmp-rwd-plus
+    name: adm-diagram
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
 #  datasource:
@@ -35,7 +35,4 @@ config:
 #      min-request-size: 2048
 #    response:
 #      # 开启响应压缩
-#      enabled: true
-#扫描Entity, 加入此设置方可在Mybatis的XML文件中使用实体类的Alias
-mybatis-plus:
-  type-handlers-package: com.persagy.dmp.basic.config
+#      enabled: true

+ 35 - 0
docker/dockerfiles/adm-diagram/Dockerfile

@@ -0,0 +1,35 @@
+#构建此镜像的基础镜像
+FROM registry.persagy.com/base/centos:v-jdk1.8
+#指定作者名称
+MAINTAINER lijie<lijie@persagy.com>
+
+#定义标签属性
+LABEL tier=backend
+LABEL product=bdtp
+LABEL project=adm-diagram
+LABEL name=adm-diagram
+
+#设置环境变量
+ENV JAVA_OPTS -Dfile.encoding=UTF-8 -Xms2048m -Xmx2048m
+ENV TZ Asia/Shanghai
+#ARG 可以接收docker build命令中以--build-arg 指定的参数
+ARG WORKER_HOME
+
+#执行的命令
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime	&& echo 'Asia/Shanghai' > /etc/timezone
+
+RUN mkdir -p $WORKER_HOME/config
+
+#复制文件到容器内
+COPY *.jar $WORKER_HOME/app.jar
+COPY entrypoint.sh $WORKER_HOME/
+COPY version.txt $WORKER_HOME/
+COPY config $WORKER_HOME/config
+#设置工作目录
+WORKDIR $WORKER_HOME
+
+#查看上述复制的文件,是否复制成功
+RUN ls
+
+#启动执行
+ENTRYPOINT ["sh","./entrypoint.sh"]

+ 3 - 0
docker/dockerfiles/adm-diagram/entrypoint.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+echo "entrypoint run..."
+java -jar $JAVA_OPTS -Dfile.encoding=UTF-8 -Dconsole.encoding=UTF-8 -Dserver.port=$SERVER_PORT -Deureka.client.service-url.defaultZone=$EUREKA_CLIENT_DEFAULT_ZONE -Dspring.cloud.config.profile=$SPRING_CLOUD_CONFIG_PROFILE -Dspring.cloud.config.uri=$SPRING_CLOUD_CONFIG_URI app.jar

+ 38 - 0
docker/dockerfiles/adm-middleware/Dockerfile

@@ -0,0 +1,38 @@
+#构建此镜像的基础镜像
+FROM java:8-jre
+#指定作者名称
+MAINTAINER lijie<lijie@persagy.com>
+
+#定义标签属性
+LABEL tier=backend
+LABEL product=bdtp
+LABEL project=adm-middleware
+LABEL name=adm-middleware
+
+#设置环境变量
+ENV JAVA_OPTS -Dfile.encoding=UTF-8 -Xms2048m -Xmx2048m
+ENV TZ Asia/Shanghai
+#ARG 可以接收docker build命令中以--build-arg 指定的参数
+ARG WORKER_HOME
+
+#执行的命令
+RUN apt-get install -y --no-install-recommends tzdata && rm -rf /var/lib/apt/lists/*
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime	&& echo 'Asia/Shanghai' > /etc/timezone
+
+RUN mkdir -p $WORKER_HOME/config
+
+#复制文件到容器内
+COPY *.jar $WORKER_HOME/app.jar
+COPY entrypoint.sh $WORKER_HOME/
+COPY version.txt $WORKER_HOME/
+COPY config $WORKER_HOME/config
+COPY temp $WORKER_HOME/temp
+
+#设置工作目录
+WORKDIR $WORKER_HOME
+
+#查看上述复制的文件,是否复制成功
+RUN ls
+
+#启动执行
+ENTRYPOINT ["sh","./entrypoint.sh"]

+ 3 - 0
docker/dockerfiles/adm-middleware/entrypoint.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+echo "entrypoint run..."
+java -jar $JAVA_OPTS -Dserver.port=$SERVER_PORT -Deureka.client.service-url.defaultZone=$EUREKA_CLIENT_DEFAULT_ZONE -Dspring.cloud.config.profile=$SPRING_CLOUD_CONFIG_PROFILE -Dspring.cloud.config.uri=$SPRING_CLOUD_CONFIG_URI app.jar

+ 36 - 0
docker/dockerfiles/adm-server/Dockerfile

@@ -0,0 +1,36 @@
+#构建此镜像的基础镜像
+FROM java:8-jre
+#指定作者名称
+MAINTAINER lijie<lijie@persagy.com>
+
+#定义标签属性
+LABEL tier=backend
+LABEL product=bdtp
+LABEL project=adm-server
+LABEL name=adm-server
+
+#设置环境变量
+ENV JAVA_OPTS -Dfile.encoding=UTF-8 -Xms2048m -Xmx2048m
+ENV TZ Asia/Shanghai
+#ARG 可以接收docker build命令中以--build-arg 指定的参数
+ARG WORKER_HOME
+
+#执行的命令
+RUN apt-get install -y --no-install-recommends tzdata && rm -rf /var/lib/apt/lists/*
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime	&& echo 'Asia/Shanghai' > /etc/timezone
+
+RUN mkdir -p $WORKER_HOME/config
+
+#复制文件到容器内
+COPY *.jar $WORKER_HOME/app.jar
+COPY entrypoint.sh $WORKER_HOME/
+COPY version.txt $WORKER_HOME/
+COPY config $WORKER_HOME/config
+#设置工作目录
+WORKDIR $WORKER_HOME
+
+#查看上述复制的文件,是否复制成功
+RUN ls
+
+#启动执行
+ENTRYPOINT ["sh","./entrypoint.sh"]

+ 3 - 0
docker/dockerfiles/adm-server/entrypoint.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+echo "entrypoint run..."
+java -jar $JAVA_OPTS -Dfile.encoding=UTF-8 -Dconsole.encoding=UTF-8 -Deureka.client.service-url.defaultZone=$EUREKA_CLIENT_DEFAULT_ZONE -Dspring.cloud.config.profile=$SPRING_CLOUD_CONFIG_PROFILE -Dspring.cloud.config.uri=$SPRING_CLOUD_CONFIG_URI app.jar

+ 64 - 0
docker/k8sfiles/adm-diagram-standard.yml

@@ -0,0 +1,64 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: adm-diagram
+  labels:
+    app: adm-diagram
+spec:
+  selector:
+    app: adm-diagram
+  ports:
+  - port: 8080
+    targetPort: 8080
+    name: server-port
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: adm-diagram
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: adm-diagram
+  template:
+    metadata:
+      labels:
+        app: adm-diagram
+    spec:
+      containers:
+      - name: adm-diagram
+        image: labisenlin.persagy.com/library/adm-diagram:latest
+        imagePullPolicy: Always
+        ports:
+        - containerPort: 8080
+          name: server-port
+        env:
+        - name: TZ
+          value: Asia/Shanghai
+        - name: SERVER_PORT
+          value: "8080"
+        - name: SPRING_CLOUD_CONFIG_URI
+          value: "http://integrated-config:8080"
+        - name: SPRING_PROFILES_ACTIVE
+          value: "dev"
+        - name: SPRING_CLOUD_CONFIG_PROFILE
+          value: "dev"
+        - name: EUREKA_CLIENT_DEFAULT_ZONE
+          value: "http://frame:123456@integrated-eureka:8080/integrated-eureka/eureka/"
+        - name: logging.config
+          value: classpath:logback-spring.xml
+        - name: eureka.instance.status-page-url
+          value: "http://${eureka.instance.ip-address}:${eureka.instance.non-secure-port}/${spring.application.name}/info"
+        - name: eureka.instance.non-secure-port-enabled
+          value: "true"
+        - name: eureka.instance.ip-address
+          value: "adm-diagram"
+        - name: eureka.instance.health-check-url
+          value: "http://${eureka.instance.ip-address}:${eureka.instance.non-secure-port}/${spring.application.name}/health"
+        - name: eureka.instance.non-secure-port
+          value: "8080"
+        - name: mybatis-plus.configuration.log-impl
+          value: "org.apache.ibatis.logging.nologging.NoLoggingImpl"

+ 64 - 0
docker/k8sfiles/adm-middleware-standard.yml

@@ -0,0 +1,64 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: adm-middleware
+  labels:
+    app: adm-middleware
+spec:
+  selector:
+    app: adm-middleware
+  ports:
+    - port: 8080
+      targetPort: 8080
+      name: server-port
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: adm-middleware
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: adm-middleware
+  template:
+    metadata:
+      labels:
+        app: adm-middleware
+    spec:
+      containers:
+        - name: adm-middleware
+          image: labisenlin.persagy.com/library/adm-middleware:latest
+          imagePullPolicy: Always
+          ports:
+            - containerPort: 8080
+              name: server-port
+          env:
+            - name: TZ
+              value: Asia/Shanghai
+            - name: SERVER_PORT
+              value: "8080"
+            - name: SPRING_CLOUD_CONFIG_URI
+              value: "http://integrated-config:8080"
+            - name: SPRING_PROFILES_ACTIVE
+              value: "dev"
+            - name: SPRING_CLOUD_CONFIG_PROFILE
+              value: "dev"
+            - name: EUREKA_CLIENT_DEFAULT_ZONE
+              value: "http://frame:123456@integrated-eureka:8080/integrated-eureka/eureka/"
+            - name: logging.config
+              value: classpath:logback-spring.xml
+            - name: eureka.instance.status-page-url
+              value: "http://${eureka.instance.ip-address}:${eureka.instance.non-secure-port}/${spring.application.name}/info"
+            - name: eureka.instance.non-secure-port-enabled
+              value: "true"
+            - name: eureka.instance.ip-address
+              value: "adm-middleware"
+            - name: eureka.instance.health-check-url
+              value: "http://${eureka.instance.ip-address}:${eureka.instance.non-secure-port}/${spring.application.name}/health"
+            - name: eureka.instance.non-secure-port
+              value: "8080"
+            - name: mybatis-plus.configuration.log-impl
+              value: "org.apache.ibatis.logging.nologging.NoLoggingImpl"

+ 64 - 0
docker/k8sfiles/adm-server-standard.yml

@@ -0,0 +1,64 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: adm-server
+  labels:
+    app: adm-server
+spec:
+  selector:
+    app: adm-server
+  ports:
+  - port: 8080
+    targetPort: 8080
+    name: server-port
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: adm-server
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: adm-server
+  template:
+    metadata:
+      labels:
+        app: adm-server
+    spec:
+      containers:
+      - name: adm-server
+        image: labisenlin.persagy.com/library/adm-server:latest
+        imagePullPolicy: Always
+        ports:
+        - containerPort: 8080
+          name: server-port
+        env:
+        - name: TZ
+          value: Asia/Shanghai
+        - name: SERVER_PORT
+          value: "8080"
+        - name: SPRING_CLOUD_CONFIG_URI
+          value: "http://integrated-config:8080"
+        - name: SPRING_PROFILES_ACTIVE
+          value: "dev"
+        - name: SPRING_CLOUD_CONFIG_PROFILE
+          value: "dev"
+        - name: EUREKA_CLIENT_DEFAULT_ZONE
+          value: "http://frame:123456@integrated-eureka:8080/integrated-eureka/eureka/"
+        - name: logging.config
+          value: classpath:logback-spring.xml
+        - name: eureka.instance.status-page-url
+          value: "http://${eureka.instance.ip-address}:${eureka.instance.non-secure-port}/${spring.application.name}/info"
+        - name: eureka.instance.non-secure-port-enabled
+          value: "true"
+        - name: eureka.instance.ip-address
+          value: "adm-server"
+        - name: eureka.instance.health-check-url
+          value: "http://${eureka.instance.ip-address}:${eureka.instance.non-secure-port}/${spring.application.name}/health"
+        - name: eureka.instance.non-secure-port
+          value: "8080"
+        - name: mybatis-plus.configuration.log-impl
+          value: "org.apache.ibatis.logging.nologging.NoLoggingImpl"