Merge branch 'release/v1.0.3'

Author: Xbluer

.github/workflows/build.yml

@@ -69,7 +69,7 @@ jobs:
             ${{ secrets.DOCKERHUB_USERNAME }}/veritas-assessment-tool:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/veritas-assessment-tool:v1
             ${{ secrets.DOCKERHUB_USERNAME }}/veritas-assessment-tool:v1.0
-            ${{ secrets.DOCKERHUB_USERNAME }}/veritas-assessment-tool:v1.0.2
+            ${{ secrets.DOCKERHUB_USERNAME }}/veritas-assessment-tool:v1.0.3
 
 
       - name: Move cache

bin/tool.sh

@@ -60,14 +60,18 @@ function print_help() {
 }
 
 function clear_cache() {
-  touch 'file/db/.clear_cache'
+  touch $CLEAR_CACHE_FILE
 }
 
 cd "$(dirname $0)" || exit
 cd .. || exit
 
+# sqlite database file
 SQLITE_FILE='file/db/sqlite.db'
 
+# If this file exists then the Java application will clear the cache and delete this file.
+CLEAR_CACHE_FILE='file/db/.clear_cache'
+
 if [[ $# -eq 0 ]]; then
   print_help;
   exit 1;

docker/docker-entrypoint.sh

@@ -1,5 +1,5 @@
 #! /bin/bash
-set -x
+
 cd $(dirname $0)/.. || exit
 
 if [ "$(ls config/)" == "" ]; then

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>org.veritas</groupId>
     <artifactId>assessment-tool</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.3</version>
     <name>assessment</name>
     <description>Assessment tool of veritas.</description>
     <properties>
@@ -269,6 +269,36 @@
                 <version>3.9.1</version>
             </plugin>
 
+            <plugin>
+                <groupId>pl.project13.maven</groupId>
+                <artifactId>git-commit-id-plugin</artifactId>
+                <version>4.0.5</version>
+                <executions>
+                    <execution>
+                        <id>get-the-git-info</id>
+                        <goals>
+                            <goal>revision</goal>
+                        </goals>
+                        <phase>initialize</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <format>json</format>
+                    <generateGitPropertiesFile>true</generateGitPropertiesFile>
+                    <generateGitPropertiesFilename>
+                        ${project.build.outputDirectory}/git-version.json
+                    </generateGitPropertiesFilename>
+                    <!--
+                        <includeOnlyProperties>
+                            <includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
+                            <includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty>
+                        </includeOnlyProperties>
+                    -->
+                    <commitIdGenerationMode>full</commitIdGenerationMode>
+                    <offline>true</offline>
+                </configuration>
+            </plugin>
+
         </plugins>
         <pluginManagement>
             <plugins>

src/main/java/org/veritas/assessment/biz/controller/admin/AdminSystemController.java

@@ -18,15 +18,23 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+import org.veritas.assessment.common.exception.NotFoundException;
 import org.veritas.assessment.system.service.SystemConfigService;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 @RestController
@@ -67,4 +75,27 @@ public void updateConfig(@RequestBody Map<String, String> configMap) {
         }
     }
 
+    private static final String GIT_VERSION_FILE_PATH = "/git-version.json";
+    private static final String versionInfo;
+
+    static {
+        String json;
+        try (InputStream is = new ClassPathResource(GIT_VERSION_FILE_PATH).getInputStream()) {
+            json = IOUtils.toString(is, StandardCharsets.UTF_8);
+        } catch (IOException exception) {
+            log.warn("can not read git version info file[{}].", GIT_VERSION_FILE_PATH,
+                    exception);
+            json = "{}";
+        }
+        versionInfo = json;
+    }
+
+    @RequestMapping(path = "/version", method = RequestMethod.GET,
+            produces = "application/json; charset=UTF-8")
+    public String getGitVersion() {
+        if (StringUtils.isEmpty(versionInfo)) {
+            throw new NotFoundException("Not found version information.");
+        }
+        return versionInfo;
+    }
 }