From f6578802ff7d22344cbc729445b6d35d3dee129e Mon Sep 17 00:00:00 2001
From: dingzhaojun <dingzhaojun@risesoft.net>
Date: Wed, 31 Jul 2024 22:01:30 +0800
Subject: [PATCH] add compose

---
 docker/compose.yml                            | 19 ++++++
 pom.xml                                       | 67 +++++++++++++++++--
 .../demo/controller/MainController.java       |  6 +-
 3 files changed, 87 insertions(+), 5 deletions(-)
 create mode 100644 docker/compose.yml

diff --git a/docker/compose.yml b/docker/compose.yml
new file mode 100644
index 0000000..92a0189
--- /dev/null
+++ b/docker/compose.yml
@@ -0,0 +1,19 @@
+version: '3.7'
+name: demo-tomcat
+services:
+  platfoem:
+    image: svn.youshengyun.com:9923/risenet-y9boot-webapp-platform-jvm:v9.7.0-SNAPSHOT
+    container_name: demo-tomcat01
+    restart: always
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+    networks:
+      - y9-share-net
+    ports:
+      - "7199:7099"
+    environment:
+      - y9.login.casLoginView=casLoginView-y9-v3.0
+        
+networks:
+  y9-share-net:
+    external: true
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2f956bd..f6163aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 	</scm>
 	<properties>
 		<java.version>21</java.version>
-		<maven.build.timestamp.format>yyyy-MM-dd_HH_mm_ss</maven.build.timestamp.format>
+		<maven.build.timestamp.format>yyyyMMdd-HHmmss</maven.build.timestamp.format>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -51,11 +51,24 @@
 	</dependencies>
 
 	<build>
-		<finalName>demo-tomcat##${build.timestamp}</finalName>
+		<finalName>${project.artifactId}##${buildNumber}</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>build-info</goal>
+						</goals>
+						<configuration>
+							<additionalProperties>
+								<build.timestamp>${buildNumber}</build.timestamp>
+								<java.version>${java.version}</java.version>
+							</additionalProperties>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 			<!--<plugin>
 				<groupId>org.codehaus.mojo</groupId>
@@ -85,14 +98,60 @@
 							<goal>timestamp-property</goal>
 						</goals>
 						<configuration>
-							<name>build.timestamp</name>
+							<name>buildNumber</name>
 							<pattern>yyyyMMdd-HHmmss</pattern>
-							<timeZone>GMT+8</timeZone>
+							<timeZone>GMT+08:00</timeZone>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
 		</plugins>
 	</build>
+	
+	<profiles>
+        <profile>
+            <id>build-docker-image</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.google.cloud.tools</groupId>
+                        <artifactId>jib-maven-plugin</artifactId>
+                        <version>3.4.3</version>
+                        <configuration>
+                            <skip>false</skip>
+                            <from>
+                                <image>tomcat:jdk21-temurin</image>
+                            </from>
+                            <container>
+                                <appRoot>/usr/local/tomcat/webapps/${project.artifactId}</appRoot>
+                            </container>
+                            <to>
+                                <image>svn.youshengyun.com:9923/${project.artifactId}-jib</image>
+                                <tags>
+                                    <tag>${project.version}</tag>
+                                    <tag>latest</tag>
+                                </tags>
+                                <auth>
+                                    <username>publisher</username>
+                                    <password>83204585</password>
+                                </auth>
+                            </to>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>
diff --git a/src/main/java/com/example/demo/controller/MainController.java b/src/main/java/com/example/demo/controller/MainController.java
index f5f3aeb..4c17bd1 100644
--- a/src/main/java/com/example/demo/controller/MainController.java
+++ b/src/main/java/com/example/demo/controller/MainController.java
@@ -1,5 +1,7 @@
 package com.example.demo.controller;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.info.BuildProperties;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -7,9 +9,11 @@ import jakarta.servlet.http.HttpServletRequest;
 
 @RestController
 public class MainController {
+	@Autowired
+	private BuildProperties buildProperties;
 
 	@GetMapping({ "", "/" })
 	public String index(HttpServletRequest request) {
-		return "hello demo-tomcat";
+		return "hello demo-tomcat " + buildProperties.get("build.timestamp");
 	}
 }