增加k8s配置文件

Dockerfile

-FROM java:8
+FROM centos
 VOLUME /tmp
-EXPOSE 8005
-# Path to jar created by gradle build
-ADD build/libs/patzn-cloud-service-lims-1.0.jar app.jar
-RUN bash -c 'touch /app.jar'
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
+#ADD ./src/test/resources/simsunttc/simsun.ttf
+ARG JAR_FILE
+COPY ${JAR_FILE} app.jar
+ENV JAVA_HOME="/usr/java/jdk1.8"
+ENV PATH="${PATH}:${JAVA_HOME}/bin:${JAVA_HOME}/sbin"
\ No newline at end of file
+# 解决docker环境中文乱码问题
+ENV LANG zh_CN.UTF-8
+# 解决时间同步问题
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+RUN echo 'Asia/Shanghai' >/etc/timezone
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-XX:MaxRAMPercentage=90.0","-XX:MinRAMPercentage=90.0","-Dfile.encoding=UTF-8","-Dsun.jnu.encoding=utf-8","-jar","/app.jar"]

Jenkinsfile-test

+
+pipeline {
+    agent any
+
+    stages {
+        stage('Build hmhj') {
+            steps {
+	            echo '=== Build hmhj Begin'
+                checkout([$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CleanBeforeCheckout']], submoduleCfg: [],
+                 userRemoteConfigs: [[credentialsId: 'Git', url: 'git@git.patzn.com:wangweidong/patzn-cloud-service-hmhj.git']]])
+            	sh """
+            	chmod +x gradlew
+            	./gradlew build  docker -x test
+            	"""
+            	echo '=== Build hmhj End'
+            }
+        }
+        stage('Docker Push') {
+            steps {
+            	echo '=== Build docker image Begin'
+                sh """
+                docker login -u patzn -p Patzn12345 https://192.168.0.192
+
+				docker tag patzn-cloud-service-hmhj:1.0 192.168.0.192/project/patzn-cloud-service-hmhj:${Tag}
+
+				docker push 192.168.0.192/project/patzn-cloud-service-hmhj:${Tag}
+                """
+            	echo '=== Build docker image End'
+            }
+        }
+        stage('Kubernetes CI/CD') {
+            steps {
+                echo '=== Kubernetes CI/CD Begin'
+                sh """
+                curl -X PUT \
+                    -H "content-type: application/json" \
+                    -H "Cookie: KuboardUsername=admin; KuboardAccessKey=7n2wfwkzz5dk.t5afebia666wya5wky3tzx5ainndnf6w" \
+                    -d '{"kind":"deployments","namespace":"patzn-project","name":"patzn-cloud-service-hmhj","images":{"192.168.0.192/project/patzn-cloud-service-hmhj":"192.168.0.192/project/patzn-cloud-service-hmhj:${Tag}"}}' \
+                    "http://192.168.0.187:10080/kuboard-api/cluster/patzn/kind/CICDApi/admin/resource/updateImageTag"
+                """
+                echo '=== Kubernetes CI/CD End'
+            }
+        }
+    }
+}

build.gradle

@@ -38,6 +38,7 @@ buildscript {
 
     dependencies {
         classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
+        classpath "com.palantir.gradle.docker:gradle-docker:0.25.0"
     }
 }
 
@@ -46,6 +47,7 @@ apply plugin: "maven"
 apply plugin: "idea"
 apply plugin: 'org.springframework.boot'
 apply plugin: "io.spring.dependency-management"
+apply plugin: "com.palantir.docker"
 
 group = "com.patzn.cloud"
 version = "1.0"
@@ -136,3 +138,10 @@ dependencies {
     implementation('org.springframework.boot:spring-boot-starter-data-mongodb')
 
 }
+
+docker {
+    dependsOn build
+    name "${project.name}:${project.version}"
+    copySpec.from(jar).rename(".*", "app.jar")
+    buildArgs(['JAR_FILE': "app.jar"])
+}
\ No newline at end of file

src/main/resources/application-k8stest.yml

+# 测试环境
+server:
+  exception:
+    to: 1327531085@qq.com;18463106881@163.com
+    form: ptlims_test@163.com
+    subject: 测试 hmhj服务异常
+swagger:
+  enable: true
+service:
+  api-url: http://api.test.patzn.com
+  url: http://api.test.patzn.com
+  province-item-url: http://60.216.97.250:8087/
+  soffice: /opt/libreoffice6.2/program/soffice
+spring:
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    url: jdbc:postgresql://192.168.0.148:5432/test_lims_hmhj
+    username: dbhmhj
+    password: sfdWrE39&d!Pt
+    dynamic:
+      enabled: false
+  # 注册中心配置
+  cloud:
+    consul:
+      host: ${k8s-consul}
+  redis:
+#    host: 124.70.150.247
+    password: patzn123TQa
+    sentinel:
+      master: mymaster
+      nodes:
+        - ${k8s-redis0}:26379
+        - ${k8s-redis1}:26379
+        - ${k8s-redis2}:26379
+  mail:
+    host: smtp.163.com
+    username: ptlims_test@163.com
+    password: QTXWOTEUSHARYDWT
+    port: 25
+    protocol: smtp
+    default-encoding: UTF-8
+  rabbitmq:
+    addresses: ${k8s-rmq0}:5672,${k8s-rmq1}:5672,${k8s-rmq2}:5672
+#    host: 124.70.150.247
+#    port: 5672
+    username: mqbase
+    password: mqb12345
+    virtual-host: /
+    topic:
+      push-msg: test.topic.push.msg
+      sys-log: test.topic.sys.log
+      chemical-classify-warning: test.topic.chemical.classify.warning
+      equip-check-msg: test.topic.equip.check.msg
+      report-make-msg: test.topic.report.make.msg
+      soil-work-msg: test.topic.soil.work.msg
+      hmhj-work-msg: test.topic.hmhj.work.msg
+
+# 对象存储配置
+#oss:
+#  bucket-name: pt-web-sys
+#  aliyun:
+#    endpoint: http://oss.test.patzn.com
+#    folder: pertest/hmhj
+
+#libreOffice 安装信息
+libreOffice:
+  url: /opt/libreOffice6.2
+### jobs
+jobs:
+  admin-address: http://api.test.patzn.com/print
\ No newline at end of file