merge v4.4.14.0-gcc13a9359 into opensource digirunner repo

Author: mini-lee-tpi

.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,13 @@
+arguments=
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.project.dir=
+eclipse.preferences.version=1
+gradle.user.home=
+java.home=
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=false
+show.console.view=false
+show.executions.view=false

Dockerfile

@@ -1,6 +1,11 @@
-FROM azul/zulu-openjdk-alpine:17
+FROM azul/zulu-openjdk-alpine:21-jre-headless-latest
 
-RUN apk add --no-cache curl
+RUN set -eux; \
+    apk update; \
+    apk upgrade; \
+    apk add --no-cache curl; \
+    mkdir -p /app; \
+    rm -rf /var/cache/apk/*;
 
 COPY ./dgrv4_Gateway_serv/build/libs/* /opt/digirunner/
 COPY ./dgrv4_Gateway_serv/keys/* /opt/digirunner/keys/

build.gradle

@@ -10,7 +10,7 @@ buildscript {
 }
 
 plugins {
-	id 'org.springframework.boot' version '3.4.0'
+	id 'org.springframework.boot' version '3.4.0' apply false // 加上 apply false
 	id 'io.spring.dependency-management' version '1.1.6'
 	id 'com.github.jk1.dependency-license-report' version '2.9'
 
@@ -35,7 +35,7 @@ licenseReport {
 
 allprojects {
 	group = 'tpi.dgrv4'
-	version = 'release-rc-v4.4.11.0-gd0900e2'
+	version = 'release-rc-v4.4.14.0-gcc13a9359'
 	apply plugin:  'io.spring.dependency-management'
 
 	repositories {
@@ -57,14 +57,13 @@ subprojects {
 	apply plugin:  'java-library'
 	apply plugin:  'eclipse'
 
-	sourceCompatibility = '17'
-	targetCompatibility = '17'
+	sourceCompatibility = '21'
+	targetCompatibility = '21'
 
 
 	dependencies {
-		implementation files("${rootDir}/libsext/dgrv4_CodecUtil-v4.4.11.0-2-gd0900e21d-lib.jar")
-		implementation files("${rootDir}/libsext/dgrv4_HttpUtil-v4.4.11.0-2-gd0900e21d-lib.jar")
-		implementation files("${rootDir}/libsext/onlineConsole-v1.0-55-gdc3e362.jar")
+		implementation files("${rootDir}/libsext/dgrv4_CodecUtil-v4.4.14.0-4-gcc13a9359-lib.jar")
+		implementation files("${rootDir}/libsext/dgrv4_HttpUtil-v4.4.14.0-4-gcc13a9359-lib.jar")
 
 		implementation ('org.springframework.boot:spring-boot-starter-data-jpa'){
 			exclude group: 'ch.qos.logback', module: 'logback-classic'
@@ -87,7 +86,7 @@ subprojects {
 		implementation 'org.jboss.xnio:xnio-nio:3.8.16.Final'
 		implementation 'jakarta.servlet:jakarta.servlet-api:6.1.0'
 
-		implementation 'com.h2database:h2'
+		compileOnly 'com.h2database:h2'
 		testImplementation 'org.springframework.boot:spring-boot-starter-test'
 		compileOnly 'org.projectlombok:lombok:1.18.32'
 		annotationProcessor 'org.projectlombok:lombok:1.18.32'
@@ -121,7 +120,7 @@ subprojects {
 		}
 		from(configurations.runtimeClasspath){
 			include '**/google-cloud-logging-logback*.jar'
-			include '**/bcprov-jdk15on*.jar'
+			include '**/bcprov-jdk18on*.jar'
 			include '**/aws-java-sdk*.jar'
 			include '**/h2-*.jar'
 			include '**/mariadb-java-client-*.jar'
@@ -134,7 +133,7 @@ subprojects {
 	}
 }
 
-def getDate() {
+static def getDate() {
 	return new Date().format('yyyyMMdd_HHmm')
 }
 
@@ -194,15 +193,19 @@ project(':dgrv4_Gateway_serv'){
 
 
 		//  compileOnly:  JDBC Driver 5 種
+		implementation 'com.h2database:h2'
 		implementation project(':dgrv4_H2Config_lib')
 		implementation 'com.microsoft.sqlserver:mssql-jdbc'
 		implementation 'com.oracle.database.jdbc:ojdbc11'
 		implementation 'org.postgresql:postgresql'
 		implementation('org.mariadb.jdbc:mariadb-java-client:3.1.2', {
 			exclude group: 'net.java.dev.jna', module: 'jna-platform'  //使用其它版本的相依
+			exclude group: 'com.google.protobuf', module: 'protobuf-java'
 		})
+		
+		// 修正上方排除的
+		compileOnly 'com.google.protobuf:protobuf-java:3.25.5'
 
-		implementation 'org.springframework.boot:spring-boot-starter-freemarker:3.3.4'
 	}
 
 	task createVersionTxt() {
@@ -281,8 +284,7 @@ project(':dgrv4_Entity_lib'){
 	dependencies{
 		implementation project(':dgrv4_Common_lib')
 		compileOnly 'org.apache.commons:commons-lang3:3.12.0'
-		compileOnly 'com.oracle.database.jdbc:ojdbc11'
-
+		
 		// Kryo Serialization
 		compileOnly 'com.esotericsoftware:kryo:5.4.0'
 	}

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

@@ -0,0 +1,2 @@
+connection.project.dir=..
+eclipse.preferences.version=1

dgrv4_Common_lib/bin/.gitignore

@@ -0,0 +1 @@
+/main/

dgrv4_Common_lib/src/main/java/tpi/dgrv4/common/constant/TsmpDpAaRtnCode.java

@@ -426,6 +426,8 @@ public enum TsmpDpAaRtnCode implements ITsmpDpAaError<TsmpDpAaException> {
 	_1557(TsmpDpModule.DP5, "57", "啟用日期需要小於停用日期"),
 	_1558(TsmpDpModule.DP5, "58", "停用日期需要小於啟用日期"),
 	_1559(TsmpDpModule.DP5, "59", "{{0}}"),
+	_1561(TsmpDpModule.DP5, "61", "對稱式加密失敗：{{0}}"),
+	_1562(TsmpDpModule.DP5, "62", "對稱式解密失敗：{{0}}"),
 
 	_2000(TsmpDpModule.DP10, "00", "必填"),
 	_2001(TsmpDpModule.DP10, "01", "最大長度為 [{{0}}]"),

dgrv4_Common_lib/src/main/java/tpi/dgrv4/common/utils/ServiceUtil.java

@@ -2,6 +2,8 @@
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.lang.management.ManagementFactory;
+import java.lang.management.OperatingSystemMXBean;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.Inet6Address;
@@ -610,14 +612,5 @@ public static Long parseSequenceToLong(Object seq) {
 		return result;
 	}
 
-	public static String getMemoryInfo() {
-		StringBuilder sb = new StringBuilder();
-		String freeMemory = Runtime.getRuntime().freeMemory() / 1024 / 1024 + "MB";
-		String totalMemory = Runtime.getRuntime().totalMemory() / 1024 / 1024 + "MB";
-		String maxMemory = Runtime.getRuntime().maxMemory() / 1024 / 1024 + "MB";
-		sb.append("\n...Memory(free/total/Max): "+freeMemory + " / " + totalMemory + " / " + maxMemory  + "\n");
-
-		return sb.toString();
-	}
 
 }

dgrv4_Common_lib/src/main/java/tpi/dgrv4/common/utils/autoInitSQL/Initializer/TsmpRtnCodeTableInitializer.java

@@ -1042,6 +1042,12 @@ public List<TsmpRtnCodeVo> insertTsmpRtnCode() {
 		    createTsmpRtnCode((tsmpRtnCodeColumn = "1559"), (locale = "zh-TW"), (tsmpRtnMsg = "{{0}}"), (tsmpRtnDesc = ""));
 		    createTsmpRtnCode((tsmpRtnCodeColumn = "1559"), (locale = "en-US"), (tsmpRtnMsg = "{{0}}"), (tsmpRtnDesc = ""));
 
+		    // 20250206, 對稱式加密/解密失敗訊息, Mini Lee
+		    createTsmpRtnCode((tsmpRtnCodeColumn = "1561"), (locale = "zh-TW"), (tsmpRtnMsg = "對稱式加密失敗：{{0}}"), (tsmpRtnDesc = ""));
+		    createTsmpRtnCode((tsmpRtnCodeColumn = "1561"), (locale = "en-US"), (tsmpRtnMsg = "Symmetric encryption error: {{0}}"), (tsmpRtnDesc = ""));
+			
+			createTsmpRtnCode((tsmpRtnCodeColumn = "1562"), (locale = "zh-TW"), (tsmpRtnMsg = "對稱式解密失敗：{{0}}"), (tsmpRtnDesc = ""));
+		    createTsmpRtnCode((tsmpRtnCodeColumn = "1562"), (locale = "en-US"), (tsmpRtnMsg = "Symmetric decryption error: {{0}}"), (tsmpRtnDesc = ""));
 		} catch (Exception e) {
 			StackTraceUtil.logStackTrace(e);
 			throw e;

dgrv4_Common_lib/src/main/java/tpi/dgrv4/common/utils/autoInitSQL/Initializer/TsmpSettingTableInitializer.java

@@ -74,8 +74,9 @@ public List<TsmpSettingVo> insertTsmpSetting() {
 	        createTsmpSetting("LDAP_TIMEOUT","3000","ldap登入的連線timeout,單位毫秒");
 	        createTsmpSetting("LDAP_CHECK_ACCT_ENABLE","false","LDAP檢查帳號功能是否啟用 true/false");
 	        ///* 交給 resetAdminConsoleData() 建立了
-	        createTsmpSetting("TSMP_AC_CLIENT_ID","YWRtaW5Db25zb2xl","登入AC的帳號 (請勿修改)");
-	        createTsmpSetting("TSMP_AC_CLIENT_PW","dHNtcDEyMw==","登入AC的密碼 (請勿修改)");
+	        createTsmpSetting("TSMP_AC_CLIENT_ID","YWRtaW5Db25zb2xl","Login AC account (do not modify)");
+			createTsmpSetting("TSMP_AC_CLIENT_PW","dHNtcDEyMw==","AC login password (do not modify)");
+
 	        // */
 	        createTsmpSetting("TSMP_FAIL_THRESHOLD","6","允許User密碼錯誤次數上限");
 	        createTsmpSetting("SSO_PKCE","true","PKCE等級AuthCode驗證是否啟用 true/false");
@@ -293,6 +294,9 @@ public List<TsmpSettingVo> insertTsmpSetting() {
 
 //	        -- 2024/12/27 HIGHWAY_THRESHOLD, Webber
 	        createTsmpSetting((id = "HIGHWAY_THRESHOLD"), (value = "1000"), (memo = "High speed channel for API requests"));
+
+//			-- 2025/02/03 kibana  status API
+			createTsmpSetting((id = "KIBANA_STATUS_URL"), (value = "/kibana/api/status"), (memo = " Kibana status API. defult: /kibana/api/status"));
 		} catch (Exception e) {
 			StackTraceUtil.logStackTrace(e);
 			throw e;

dgrv4_Common_lib/src/main/resources/application.properties

@@ -0,0 +1,2 @@
+connection.project.dir=..
+eclipse.preferences.version=1

dgrv4_Entity_lib/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1 @@
+/main/

dgrv4_Entity_lib/bin/.gitignore

@@ -52,7 +52,7 @@ public class TsmpCoreTokenInitializer {
 	private static final String KEY_TYPE = "digiRunner.token.keyStoreType";
 
 	private static final String KEY_ALIAS = "digiRunner.token.keyAlias";
-
+	
 	@Autowired
 	private ITPILogger logger;
 
@@ -80,17 +80,17 @@ public TsmpCoreTokenInitializer(ITPILogger logger) {
 	 * 並與資料庫(tsmp_dp_file)儲存的 KeyPair 比對，若資料庫無 KeyPair 或是兩者的 KeyPair hashCode
 	 * 不相符<br>
 	 * 則將 ${digiRunner.token.key-store.path} JKS 中的 KeyPair 新增/更新至資料庫
-	 *
+	 * 
 	 * @param e
 	 * @throws Exception
 	 */
 	@EventListener
 	public void init(ContextRefreshedEvent e) throws Exception {
-
+		
 		StringBuffer info = new StringBuffer();
 		final StringBuffer infoStr = info;
 		final int delayTime = 800;
-
+		
 		// 利用時間差取得 Spring Boot 啟動完成的訊息, "Started DgrApplication in 20.436 seconds"
 		new Thread() {
 			public void run() {
@@ -107,8 +107,8 @@ public void run() {
 				logger.tl.info(infoStr.toString());
 			}
 		}.start();
-
-
+		
+		
 		KeyPair localKeyPair = getKeyPair();
 		KeyPair remoteKeyPair = loadAndExtractKeyPair();
 
@@ -136,7 +136,7 @@ public void run() {
 		// 留給 {@link TsmpCoreTokenHelper} 用
 		TsmpCoreTokenInitializer.KEY_PAIR_FILE_NAME = getKeyStoreName();
 		logger.tl.debugDelay2sec("=== Token keyPair initialize successfully! ===");
-
+		
 		final StringBuffer buf = new StringBuffer();
 		new Thread() {
 			public void run() {
@@ -167,7 +167,7 @@ private String getProjectName() {
 	 * 有時 AP 環境跟 DB 環境可能在不同系統上運行，造成目錄路徑的預設分隔符號有差異 ("/"與"\")，<br>
 	 * 這會導致使用 filePath 查詢 TSMP_DP_FILE 表時查無資料<br>
 	 * 因此利用 "KEY_PAIR" 檔案類型應該只會有一筆的特性，來查詢 keyPair
-	 *
+	 * 
 	 * @return
 	 */
 	private KeyPair getKeyPair() {
@@ -211,7 +211,7 @@ private KeyPair getKeyPair() {
 
 	/**
 	 * 將 KeyPair 儲存至 TsmpDpFile 中
-	 *
+	 * 
 	 * @param keyPair
 	 * @return
 	 * @throws TsmpAsyCryptInitException
@@ -261,7 +261,7 @@ private TsmpDpFile setKeyPair(KeyPair keyPair) throws Exception {
 
 	/**
 	 * 載入 KeyStore 並取出金鑰對
-	 *
+	 * 
 	 * @return
 	 */
 	private KeyPair loadAndExtractKeyPair() {
@@ -345,7 +345,7 @@ private KeyPair loadAndExtractKeyPair() {
 
 	/**
 	 * 產生一組 KeyPair 並存到 TsmpDpFile 中
-	 *
+	 * 
 	 * @param algorithm
 	 * @param keySize   1024 or 2048
 	 * @return
@@ -368,7 +368,7 @@ private KeyPair generateKeyPair(String algorithm, int keySize) throws Exception
 
 	/**
 	 * 從資料庫取得 KeyPair 的 TsmpDpFile 檔
-	 *
+	 * 
 	 * @return
 	 */
 	private TsmpDpFile getKeyPairFileEntry() {
@@ -395,7 +395,7 @@ private boolean isReadyToLoadKeyStore() {
 
 	/**
 	 * 確認 KeyStore 是否已載入
-	 *
+	 * 
 	 * @param keyStore
 	 * @return
 	 */
@@ -409,7 +409,7 @@ private boolean isKeyStoreLoaded(KeyStore keyStore) {
 
 	/**
 	 * KeyPair反序列化
-	 *
+	 * 
 	 * @param content
 	 * @return
 	 */
@@ -424,7 +424,7 @@ private KeyPair deserializeKeyPair(byte[] content) throws Exception {
 
 	/**
 	 * KeyPair序列化
-	 *
+	 * 
 	 * @param obj
 	 * @return
 	 * @throws Exception
@@ -442,7 +442,7 @@ private byte[] serializeKeyPair(Object obj) throws Exception {
 
 	/**
 	 * 檢查公、私鑰的 Hash 值是否相同
-	 *
+	 * 
 	 * @param kp1
 	 * @param kp2
 	 * @return
@@ -462,11 +462,11 @@ private void mySleepTsmpCoreTokenInitializer(long t) {
 			Thread.currentThread().interrupt();
 		}
 	}
-
+	
 	protected IVersionService getVersionService() {
 		return versionService;
 	}
-
+	
 	protected Environment getEnvironment() {
 		return env;
 	}

dgrv4_Entity_lib/src/main/java/tpi/dgrv4/entity/component/cipher/TsmpCoreTokenInitializer.java

@@ -117,28 +117,11 @@ private String genKey() {
 	}
 
 	public String encrypt(String content) {
-		/*
-		 * 2022.05.10 改用 AESUtils try { byte[] contentBytes =
-		 * content.getBytes(this.defaultCharset); byte[] encryptBytes =
-		 * getEncryptCipher().doFinal(contentBytes); String code =
-		 * HexStringUtils.toString(encryptBytes); return code; } catch (Exception e) {
-		 * logger.debug(StackTraceUtil.logStackTrace(e)); throw
-		 * DgrRtnCode._1297.throwing(); }
-		 */
 		String code = encryptByAESUtils(content);
 		return code;
 	}
 
 	public String decrypt(String content) {
-		/*
-		 * 2022.05.10 改用 AESUtils try { byte[] contentBytes =
-		 * HexStringUtils.toBytes(content); byte[] decryptBytes =
-		 * getDecryptCipher().doFinal(contentBytes);
-		 * 
-		 * String decryptContent = new String(decryptBytes); return decryptContent; }
-		 * catch (Exception e) { logger.debug(StackTraceUtil.logStackTrace(e)); throw
-		 * DgrRtnCode._1297.throwing(); }
-		 */
 		String decryptContent = decryptByAESUtils(content);
 		return decryptContent;
 	}
@@ -169,9 +152,12 @@ public String decryptByAESUtils(String content) {
 			String dec = AESUtils.AesCipher(content, Cipher.DECRYPT_MODE, this.keySize, this.algorithm, null, seed);
 
 			return dec;
-		} catch (Exception e) {
-			logger.debug(StackTraceUtil.logStackTrace(e));
-			throw TsmpDpAaRtnCode._1297.throwing();
+		} catch (Exception e) {// AES 解密錯誤
+			StringBuilder sb = new StringBuilder();
+			sb.append("...AES decryption error. \n");
+			sb.append(StackTraceUtil.logStackTrace(e));
+			ITPILogger.tl.error(sb.toString());
+			throw TsmpDpAaRtnCode._1562.throwing("AES");
 		}
 	}