feat: Upgraded to Spring Boot 3.5.7, Gradle 9.1.0, Java 25, and replaced with Tomcat; added charts to the homepage dashboard; added an idle countdown reminder; added password change upon first login; added client-side password strength settings; allowed custom sub-versions for AC OIDC IdPs and enabled login without recognizing IdP Type; optimized Basic Auth and ClientCredential performance; removed customization and Line alerts; fixed Mail template and API registration copying issues; and fixed Mocktest errors.

Author: mini-lee-tpi

.github/workflows/release_asset_upload.yml

@@ -12,8 +12,8 @@ env:
   QUICKSTART_VERSION: 1.3.8
   TEMP_DIR: ${{ github.workspace }}/temp
   DOWNLOADS_DIR: ${{ github.workspace }}/downloads
-  MAC_JRE_URL: https://cdn.azul.com/zulu/bin/zulu21.42.19-ca-jre21.0.7-macosx_aarch64.zip
-  WIN_JRE_URL: https://cdn.azul.com/zulu/bin/zulu21.42.19-ca-jre21.0.7-win_x64.zip
+  MAC_JRE_URL: https://cdn.azul.com/zulu/bin/zulu25.30.17-ca-jre25.0.1-macosx_aarch64.zip
+  WIN_JRE_URL: https://cdn.azul.com/zulu/bin/zulu25.30.17-ca-jre25.0.1-win_x64.zip
 
 jobs:
   build_and_upload_assets:
@@ -27,10 +27,10 @@ jobs:
         with:
           ref: ${{ github.event.release.tag_name }}
 
-      - name: Set up Zulu JDK 21
+      - name: Set up Zulu JDK 25
         uses: actions/setup-java@v4
         with:
-          java-version: '21'
+          java-version: '25'
           distribution: 'zulu'
 
       - name: Build with Gradle
@@ -87,8 +87,8 @@ jobs:
         run: |
           unzip -q ${{ env.DOWNLOADS_DIR }}/win/java_jre.zip -d ${{ env.TEMP_DIR }}/win && rm ${{ env.DOWNLOADS_DIR }}/win/java_jre.zip
           unzip -q ${{ env.DOWNLOADS_DIR }}/mac/java_jre.zip -d ${{ env.TEMP_DIR }}/mac && rm ${{ env.DOWNLOADS_DIR }}/mac/java_jre.zip
-          mv ${{ env.TEMP_DIR }}/win/zulu21.42.19-ca-jre21.0.7-win_x64 ${{ env.TEMP_DIR }}/win/jre
-          mv ${{ env.TEMP_DIR }}/mac/zulu21.42.19-ca-jre21.0.7-macosx_aarch64 ${{ env.TEMP_DIR }}/mac/jre
+          mv ${{ env.TEMP_DIR }}/win/zulu25.30.17-ca-jre25.0.1-win_x64 ${{ env.TEMP_DIR }}/win/jre
+          mv ${{ env.TEMP_DIR }}/mac/zulu25.30.17-ca-jre25.0.1-macosx_aarch64 ${{ env.TEMP_DIR }}/mac/jre
           echo "ls -l ${{ env.TEMP_DIR }}/win/jre"
           ls -l ${{ env.TEMP_DIR }}/win/jre 
           echo "ls -l ${{ env.TEMP_DIR }}/mac/jre"
@@ -132,8 +132,8 @@ jobs:
           body: |
             ### Files:
               - `${{ env.H2_PACKAGE_NAME }}.zip`: digirunner with dependencies and H2 database package
-              - `${{ env.MAC_ARM64_PACKAGE_NAME }}.zip`: Package with TPIsoftwareOSPO/quickstart MacOS ARM64 portable and Azul Zulu Java 21 JRE
-              - `${{ env.WIN_AMD64_PACKAGE_NAME }}.zip`: Package with TPIsoftwareOSPO/quickstart Windows AMD64 quickstart portable and Azul Zulu Java 21 JRE
+              - `${{ env.MAC_ARM64_PACKAGE_NAME }}.zip`: Package with TPIsoftwareOSPO/quickstart MacOS ARM64 portable and Azul Zulu Java 25 JRE
+              - `${{ env.WIN_AMD64_PACKAGE_NAME }}.zip`: Package with TPIsoftwareOSPO/quickstart Windows AMD64 quickstart portable and Azul Zulu Java 25 JRE
             ### References:
               - TPIsoftwareOSPO/quickstart: [v${{ env.QUICKSTART_VERSION }}](https://github.com/TPIsoftwareOSPO/quickstart/releases/tag/v${{ env.QUICKSTART_VERSION }})
           files: |

Dockerfile

@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk-alpine:21-jre-headless-latest
+FROM azul/zulu-openjdk-alpine:25
 
 RUN set -eux; \
     apk update; \

build.gradle

@@ -1,26 +1,15 @@
-buildscript {
-	repositories {
-		maven {
-			url "https://plugins.gradle.org/m2/"
-		}
-	}
-	dependencies {
-		classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.5.0.2730"
-	}
-}
-
 plugins {
-	id 'org.springframework.boot' version '3.4.9'
-	id 'io.spring.dependency-management' version '1.1.6'
+	id 'org.springframework.boot' version '3.5.7'
+	id 'io.spring.dependency-management' version '1.1.7'
 	id 'com.github.jk1.dependency-license-report' version '2.9'
 
-	id "org.sonarqube" version "5.1.0.4882"
+	id "org.sonarqube" version "7.0.1.6134"
 	id 'com.google.protobuf' version '0.9.4'
 	id "jacoco"
 	id 'java'
 }
 
-jar {
+bootJar {
 	enabled false
 }
 
@@ -31,23 +20,29 @@ licenseReport {
 	allowedLicensesFile = project.layout.projectDirectory.file("${rootDir}/.tmp/allowed-licenses.json").asFile
 }
 
-
-
 allprojects {
 	group = 'tpi.dgrv4'
-	version = 'release-rc-v4.5.19.0-4-g052aa0662'
+	version = 'release-rc-v4.7.3.5'
 	apply plugin:  'io.spring.dependency-management'
-
+	
 	repositories {
 		mavenCentral()
 	}
-
+	
 	// 指定編碼 UTF-8
-	tasks.withType(JavaCompile) {
+	tasks.withType(JavaCompile).configureEach {
 		options.encoding = "UTF-8"
+	}	
+	tasks.withType(Test).tap {
+		configureEach {
+			systemProperty "file.encoding", "UTF-8"
+		}
 	}
-	tasks.withType(Test) {
-		systemProperty "file.encoding", "UTF-8"
+}
+
+sonarqube {
+	properties {
+		property "sonar.cpd.exclusions", "**/vo/**"
 	}
 }
 
@@ -57,13 +52,15 @@ subprojects {
 	apply plugin:  'java-library'
 	apply plugin:  'eclipse'
 
-	sourceCompatibility = '21'
-	targetCompatibility = '21'
-
+    java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(25)
+        }
+    }
 
 	dependencies {
-		implementation files("${rootDir}/libsext/dgrv4_CodecUtil-v4.5.19.0-4-g052aa0662-lib.jar")
-		implementation files("${rootDir}/libsext/dgrv4_HttpUtil-v4.5.19.0-4-g052aa0662-lib.jar")
+		implementation files("${rootDir}/libsext/dgrv4_CodecUtil-v4.7.3.5-lib.jar")
+		implementation files("${rootDir}/libsext/dgrv4_HttpUtil-v4.7.3.5-lib.jar")
 
 		implementation ('org.springframework.boot:spring-boot-starter-data-jpa'){
 			//CVE-2025-41249
@@ -73,42 +70,38 @@ subprojects {
 		}
 
 		// Correct the above exclusions, CVE-2025-41249
-		implementation 'org.springframework:spring-core:6.2.11'		
+		implementation 'org.springframework:spring-core:6.2.11'
 		// Correct the above exclusions, CVE-2025-11226
 		implementation 'ch.qos.logback:logback-core:1.5.19'
 
-		implementation ('org.springframework.boot:spring-boot-starter-web'){
-			exclude group:'org.apache.tomcat.embed', module:'tomcat-embed-core'
-		}
-		
-		// 修正上方排除的 org.apache.tomcat.embed:tomcat-embed-core
-		implementation 'org.apache.tomcat.embed:tomcat-embed-core:11.0.12'
-
-		// 添加 Undertow (乾淨的 undertow) , 預計升級 springboot v3.4.0
-    	implementation ('org.springframework.boot:spring-boot-starter-undertow'){}
+		implementation 'org.springframework.boot:spring-boot-starter-web'
 
 		implementation 'org.jboss.xnio:xnio-nio:3.8.16.Final'
 		implementation 'jakarta.servlet:jakarta.servlet-api:6.1.0'
 
 		compileOnly 'com.h2database:h2'
-		compileOnly 'org.projectlombok:lombok:1.18.32'
-		annotationProcessor 'org.projectlombok:lombok:1.18.32'
+		compileOnly 'org.projectlombok:lombok:1.18.42'
+		annotationProcessor 'org.projectlombok:lombok:1.18.42'
 		implementation 'commons-io:commons-io:2.16.1'
 		// CVE-2025-8885,CVE-2025-12194
 		implementation 'org.bouncycastle:bc-fips:2.1.2'
 
 		implementation 'org.bouncycastle:bcpkix-fips:2.1.9'
 	}
-
+	
 	// clear lib
-	task myClearLib(type: Delete) {
-		delete "$buildDir/libs/lib"
-		delete "$buildDir/libs/libsext"
-	}
-
+	// 使用 tasks.register 以符合 Gradle 新版推薦寫法
+    tasks.register('myClearLib', Delete) {
+        delete layout.buildDirectory.dir("libs/lib")
+        delete layout.buildDirectory.dir("libs/libsext")
+    }
+	
 	// copy lib
-	task myCopyLib(dependsOn:resolveMainClassName, type: Copy) {
-		//task myCopyLib(type: Copy) {
+	tasks.register('myCopyLib', Copy) {
+        dependsOn tasks.named('resolveMainClassName')
+        // 修正衝突：確保測試執行完後才進行複製動作
+        mustRunAfter tasks.named('test')
+        
 		from(configurations.runtimeClasspath){
 			include '**/*.jar'
 			exclude '**/dgrv4*.jar'
@@ -198,9 +191,6 @@ project(':dgrv4_Gateway_serv'){
 		}
 		//修正上方排除的CVE-2025-41254
 		implementation 'org.springframework:spring-websocket:6.2.12'
-		
-		implementation 'io.undertow:undertow-core:2.3.17.Final'
-		implementation 'io.undertow:undertow-websockets-jsr:2.3.17.Final'
 
 		implementation 'com.github.oshi:oshi-core:6.4.5'
 		implementation 'net.java.dev.jna:jna:5.13.0'
@@ -219,19 +209,7 @@ project(':dgrv4_Gateway_serv'){
 
 		// 修正上方排除的
 		compileOnly 'com.google.protobuf:protobuf-java:3.25.5'
-		
-		implementation ('org.owasp.esapi:esapi:2.7.0.0'){
-			exclude group:'commons-beanutils', module:'commons-beanutils'
-			exclude group:'commons-fileupload', module:'commons-fileupload'
-			exclude group:'commons-lang', module:'commons-lang'
-			exclude group:'commons-configuration', module:'commons-configuration'
-		}
-		
-		// Correct the above exclusions, group:'commons-beanutils', module:'commons-beanutils'
-		implementation 'commons-beanutils:commons-beanutils:1.11.0'		
-		// Correct the above exclusions, group:'commons-fileupload', module:'commons-fileupload'
-		implementation 'commons-fileupload:commons-fileupload:1.6.0'
-		
+
 		// gRPC Proxy
 		implementation 'net.devh:grpc-server-spring-boot-starter:2.15.0.RELEASE'
 		implementation 'io.grpc:grpc-netty-shaded:1.75.0'
@@ -301,7 +279,7 @@ project(':dgrv4_Gateway_serv'){
 	bootJar {
 		dependsOn createVersionTxt
 
-		archivesBaseName = "digiRunner"
+		archiveBaseName = "digiRunner"
 
 		dependsOn myClearLib
 		dependsOn (myCopyLib)
@@ -346,7 +324,7 @@ project(':dgrv4_Common_lib'){
 		exclude "**/*.xml"
 
 		archiveClassifier = 'lib' // 去除 postfix = plain 字樣
-		archivesBaseName = "dgrv4-common"
+		archiveBaseName = "dgrv4-common"
 		if (project.hasProperty("version")) {
 			archiveVersion = version + '-' + getDate() //換版時修改
 		}
@@ -377,7 +355,7 @@ project(':dgrv4_Entity_lib'){
 		exclude "**/*.xml"
 
 		archiveClassifier = 'lib' // 去除 postfix = plain 字樣
-		archivesBaseName = "dgrv4_Entity"
+		archiveBaseName = "dgrv4_Entity"
 		if (project.hasProperty("version")) {
 			archiveVersion = version + '-' + getDate() //換版時修改
 		}
@@ -404,7 +382,7 @@ project(':dgrv4_H2Config_lib'){
 		exclude "**/*.xml"
 
 		archiveClassifier = 'lib' // 去除 postfix = plain 字樣
-		archivesBaseName = "dgrv4_H2Config"  // ** Copy 使用後記得改名字 **
+		archiveBaseName = "dgrv4_H2Config"  // ** Copy 使用後記得改名字 **
 		if (project.hasProperty("version")) {
 			archiveVersion = version + '-' + getDate() //換版時修改
 		}
@@ -434,7 +412,7 @@ project(':dgrv4_KeeperServer_lib'){
 		exclude "**/*.xml"
 
 		archiveClassifier = 'lib' // 去除 postfix = plain 字樣
-		archivesBaseName = "dgrv4_KeeperServer"
+		archiveBaseName = "dgrv4_KeeperServer"
 		if (project.hasProperty("version")) {
 			archiveVersion = version + '-' + getDate() //換版時修改
 		}

dgrv4_Common_lib/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
+org.eclipse.jdt.core.compiler.source=25

dgrv4_Common_lib/bin/.gitignore

@@ -1,2 +1,2 @@
-/main/
-/test/
+/main/
+/test/

dgrv4_Common_lib/src/main/java/tpi/dgrv4/aws/ifs/IdgRaws.java

@@ -1,10 +1,10 @@
-package tpi.dgrv4.aws.ifs;
-
-import tpi.dgrv4.common.keeper.ITPILogger;
-
-public interface IdgRaws {
-	public Boolean awsApi(String productCode, Integer publicKeyVersion, String nonce, String keyStr, ITPILogger tl)
-			throws Exception ;
-
-	public String getRegisterUsageResult() ;
-}
+package tpi.dgrv4.aws.ifs;
+
+import tpi.dgrv4.common.keeper.ITPILogger;
+
+public interface IdgRaws {
+	public Boolean awsApi(String productCode, Integer publicKeyVersion, String nonce, String keyStr, ITPILogger tl)
+			throws Exception ;
+
+	public String getRegisterUsageResult() ;
+}

dgrv4_Common_lib/src/main/java/tpi/dgrv4/common/component/CommonFileHelper.java

@@ -1,27 +1,27 @@
-package tpi.dgrv4.common.component;
-
-import java.io.File;
-import java.util.regex.Matcher;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class CommonFileHelper {
-	
-	/**
-	 * 替換分隔符為系統預設
-	 * @param path
-	 * @param isTruncateLeadingSeperator
-	 * @return
-	 */
-	public static final String filterPath(String path, boolean isTruncateLeadingSeperator) {
-		if (path != null) {
-			path = path.replaceAll("(\\\\+|/+)", Matcher.quoteReplacement(File.separator));
-			if (isTruncateLeadingSeperator) {
-				path = path.replaceFirst("^" + Matcher.quoteReplacement(File.separator), "");
-			}
-		}
-		return path;
-	}
-	
-}
+package tpi.dgrv4.common.component;
+
+import java.io.File;
+import java.util.regex.Matcher;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class CommonFileHelper {
+	
+	/**
+	 * 替換分隔符為系統預設
+	 * @param path
+	 * @param isTruncateLeadingSeperator
+	 * @return
+	 */
+	public static final String filterPath(String path, boolean isTruncateLeadingSeperator) {
+		if (path != null) {
+			path = path.replaceAll("(\\\\+|/+)", Matcher.quoteReplacement(File.separator));
+			if (isTruncateLeadingSeperator) {
+				path = path.replaceFirst("^" + Matcher.quoteReplacement(File.separator), "");
+			}
+		}
+		return path;
+	}
+	
+}