Skip to content

Commit bddce2c

Browse files
mini-lee-tpimini-lee-tpi
committed
Optimize thread quantity monitoring, fix alarm scheduling failure issue, fix periodic scheduling time setting issue, adjust RDB connection example
1 parent dffe64d commit bddce2c

32 files changed

Lines changed: 279 additions & 225 deletions

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ licenseReport {
3535

3636
allprojects {
3737
group = 'tpi.dgrv4'
38-
version = 'release-v4.5.15'
38+
version = 'release-rc-v4.5.16.3'
3939
apply plugin: 'io.spring.dependency-management'
4040

4141
repositories {
@@ -62,8 +62,8 @@ subprojects {
6262

6363

6464
dependencies {
65-
implementation files("${rootDir}/libsext/dgrv4_CodecUtil-v4.5.15.7-lib.jar")
66-
implementation files("${rootDir}/libsext/dgrv4_HttpUtil-v4.5.15.7-lib.jar")
65+
implementation files("${rootDir}/libsext/dgrv4_CodecUtil-v4.5.16.3-lib.jar")
66+
implementation files("${rootDir}/libsext/dgrv4_HttpUtil-v4.5.16.3-lib.jar")
6767

6868
implementation ('org.springframework.boot:spring-boot-starter-data-jpa'){
6969
exclude group: 'ch.qos.logback', module: 'logback-classic'

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,7 @@ public enum TsmpDpAaRtnCode implements ITsmpDpAaError<TsmpDpAaException> {
430430
_1562(TsmpDpModule.DP5, "62", "對稱式解密失敗：{{0}}"),
431431

432432
_1565(TsmpDpModule.DP5, "65", "查無簽核關卡設定，應設定簽核關卡"),
433+
_1566(TsmpDpModule.DP4, "66", "結束日期不可小於開始日期"),
433434

434435
_2000(TsmpDpModule.DP10, "00", "必填"),
435436
_2001(TsmpDpModule.DP10, "01", "最大長度為 [{{0}}]"),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ public static String dataMask(String str, int front, int end) {
369369
}
370370

371371
//需要擷取的長度,若大於資料,全取代為*
372-
if ((front + end) > str.length()) {
372+
if ((front + end) >= str.length()) {
373373
StringBuffer strBuffer = new StringBuffer();
374374
for (int i = 0; i < str.length(); i++) {
375375
strBuffer.append("*");

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,9 @@ public List<TsmpRtnCodeVo> insertTsmpRtnCode() {
10531053
createTsmpRtnCode((tsmpRtnCodeColumn = "1565"), (locale = "zh-TW"), (tsmpRtnMsg = "查無簽核關卡設定，應設定簽核關卡"), (tsmpRtnDesc = ""));
10541054
createTsmpRtnCode((tsmpRtnCodeColumn = "1565"), (locale = "en-US"), (tsmpRtnMsg = "No approval setting found, should set approval setting"), (tsmpRtnDesc = ""));
10551055

1056-
1056+
// 20250722, 結束日期不可小於開始日期, Kevin Cheng
1057+
createTsmpRtnCode((tsmpRtnCodeColumn = "1566"), (locale = "zh-TW"), (tsmpRtnMsg = "結束日期不可小於開始日期"), (tsmpRtnDesc = ""));
1058+
createTsmpRtnCode((tsmpRtnCodeColumn = "1566"), (locale = "en-US"), (tsmpRtnMsg = "End date cannot be less than start date"), (tsmpRtnDesc = ""));
10571059

10581060

10591061

‎dgrv4_Entity_lib/src/main/java/tpi/dgrv4/entity/exceptions/DgrRtnCode.java‎

Lines changed: 122 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -1,118 +1,122 @@
1-
package tpi.dgrv4.entity.exceptions;
2-
3-
/**
4-
* 定義Return Code
5-
* Tip: 錯誤盡可能地定義明確，以避免定義過多模糊的錯誤，例如下載檔案失敗，可以明確指出是因為檔案不存在而造成的。
6-
*/
7-
public enum DgrRtnCode implements DgrError<DgrException> {
8-
_0125(DgrModule.DP0,"25","API不存在"),
9-
SUCCESS(DgrModule.DP, "00", "成功"),
10-
NO_FILE(DgrModule.DP, "29", "查無檔案"),
11-
_1191(DgrModule.DP, "91", "資料已被異動"),
12-
SYSTEM_ERROR(DgrModule.DP, "99", "系統錯誤"),
13-
_1202(DgrModule.DP2, "02", "查無類型清單"),
14-
_1219(DgrModule.DP2, "19", "Permission denied"), //沒有權限, John: 這裡要用英文 shutdown API 會用到
15-
_1227(DgrModule.DP2, "27", "生效日期不可小於今天"),
16-
_1230(DgrModule.DP2, "30", "角色不存在"),
17-
_1231(DgrModule.DP2, "31", "使用者不存在"),
18-
_1239(DgrModule.DP2, "39", "角色代號重複"),
19-
_1240(DgrModule.DP2, "40", "角色名稱重複"),
20-
_1241(DgrModule.DP2, "41", "功能不存在 (含locale)"),
21-
_1251(DgrModule.DP2, "51", "當前排程狀態不允許異動"),
22-
_1261(DgrModule.DP2, "61", "狀態:必填參數"),
23-
_1264(DgrModule.DP2, "64", "登入角色不存在"),
24-
_1284(DgrModule.DP2, "84", "[{{0}}] 不得重複"),
25-
_1285(DgrModule.DP2, "85", "Return code 參數不符合多國語系定義"),
26-
_1286(DgrModule.DP2, "86", "更新失敗"),
27-
_1287(DgrModule.DP2, "87", "刪除失敗"),
28-
_1289(DgrModule.DP2, "89", "查無 locale [{{0}}] 的 rtn code [{{1}}] 訊息"),
29-
_1288(DgrModule.DP2, "88", "新增失敗"),
30-
_1290(DgrModule.DP2, "90", "參數錯誤"),
31-
_1292(DgrModule.DP2, "92", "工作佇列已滿, 請稍後再執行"),
32-
_1293(DgrModule.DP2, "93", "資料庫錯誤"),
33-
_1295(DgrModule.DP2, "95", "日期格式不正確"),
34-
_1296(DgrModule.DP2, "96", "缺少必填參數"),
35-
_1297(DgrModule.DP2, "97", "執行錯誤"),
36-
_1298(DgrModule.DP2, "98", "查無資料"),
37-
_1300(DgrModule.DP3, "00", "角色代號:長度限制 [{{0}}] 字內，您輸入[{{1}}] 個字"),
38-
_1301(DgrModule.DP3, "01", "角色代號:只能輸入英文字母(a~z,A~Z)及數字且不含空白"),
39-
_1302(DgrModule.DP3, "02", "角色名稱:長度限制 [{{0}}] 字內，您輸入[{{1}}] 個字"),
40-
_1309(DgrModule.DP3, "09", "功能清單:必填參數"),
41-
_1344(DgrModule.DP3, "44", "用戶端不存在"),
42-
_1350(DgrModule.DP3, "50", "[{{0}}] 為必填欄位"),
43-
_1351(DgrModule.DP3, "51", "[{{0}}] 長度限制 [{{1}}] 字內，您輸入[{{2}}] 個字"),
44-
_1352(DgrModule.DP3, "52", "[{{0}}] 格式不正確"),
45-
_1355(DgrModule.DP3, "55", "[{{0}}] 不得小於 {{1}}, 您輸入 {{2}}"),
46-
_1356(DgrModule.DP3, "56", "[{{0}}] 不得大於 {{1}}, 您輸入 {{2}}"),
47-
_1357(DgrModule.DP3, "57", "您的角色並未授權使用 API txID [{{0}}]"),
48-
_1384(DgrModule.DP3, "84", "[{{0}}] 長度至少須 [{{1}}] 字，您輸入[{{2}}] 個字"),
49-
_1406(DgrModule.DP4, "06", "[{{0}}] 數量不可少於 [{{1}}]，您選擇 [{{2}}]"),
50-
_1407(DgrModule.DP4, "07", "[{{0}}] 數量不可超過 [{{1}}]，您選擇 [{{2}}]"),
51-
_1410(DgrModule.DP4, "10", "群組[{{0}}]不存在"),
52-
_1433(DgrModule.DP4, "33", "非對稱式加密失敗：[{{0}}]"),
53-
_1434(DgrModule.DP4, "34", "非對稱式解密失敗：[{{0}}]"),
54-
_1472(DgrModule.DP4, "72", "使用者已鎖定"),
55-
_1474(DgrModule.DP4, "74", "設定檔缺少參數 [{{0}}]"),
56-
_1491(DgrModule.DP4, "91", "執行工作不存在: {{0}}"),
57-
_1510(DgrModule.DP5, "10", "驗證失敗"),
58-
_1511(DgrModule.DP5, "11", "LDAP未啟用"),
59-
_1512(DgrModule.DP5, "12", "連線失敗"),
60-
_1514(DgrModule.DP5, "14", "您所在的網段,無法登入"),
61-
_1515(DgrModule.DP5, "15", "單個用戶不能存在於多個群組中"),
62-
_1516(DgrModule.DP5, "16", "使用者沒有任何群組"),
63-
_1541(DgrModule.DP5, "41", "Token已失效"),
64-
_2000(DgrModule.DP10, "00", "必填"),
65-
_2001(DgrModule.DP10, "01", "最大長度為 [{{0}}]"),
66-
_2002(DgrModule.DP10, "02", "最小長度為 [{{0}}]"),
67-
_2003(DgrModule.DP10, "03", "必須包含 [{{0}}]"),
68-
_2004(DgrModule.DP10, "04", "不得包含 [{{0}}]"),
69-
_2005(DgrModule.DP10, "05", "數值不可大於 [{{0}}]"),
70-
_2006(DgrModule.DP10, "06", "數值不可小於 [{{0}}]"),
71-
_2007(DgrModule.DP10, "07", "格式不正確"),
72-
_2008(DgrModule.DP10, "08", "僅可輸入英數字、底線「_」及橫線「-」"),
73-
_2009(DgrModule.DP10, "09", "最少選擇 [{{0}}] 項"),
74-
_2010(DgrModule.DP10, "10", "最多選擇 [{{0}}] 項"),
75-
_1497(DgrModule.DP4, "97", "介接規格錯誤：[{{0}}] - [{{1}}]"),
76-
_9901(DgrModule.DP99, "01", "System error"),
77-
_9906(DgrModule.DP99, "06", "Client requests exceeds TPS limit"),
78-
_9912(DgrModule.DP99, "12", "API was disabled"),
79-
_9926(DgrModule.DP99, "26", "Invalid Character"),
80-
_9930(DgrModule.DP99, "30", "Invalid String"),
81-
_9978(DgrModule.DP99, "78", "不合法的 Host Header"),
82-
;
83-
84-
private DgrModule module;
85-
private String seq;
86-
private String defaultMessage;
87-
88-
private DgrRtnCode(DgrModule module, String seq, String defaultMessage) {
89-
this.module = module;
90-
this.seq = seq;
91-
this.defaultMessage = defaultMessage;
92-
}
93-
94-
@Override
95-
public DgrModule getModule() {
96-
return this.module;
97-
}
98-
99-
@Override
100-
public String getSeq() {
101-
return this.seq;
102-
}
103-
104-
@Override
105-
public String getDefaultMessage() {
106-
return this.defaultMessage;
107-
}
108-
109-
public static DgrRtnCode parse(String code) {
110-
for(DgrRtnCode item : DgrRtnCode.values()) {
111-
if(item.getCode().equals(code)) {
112-
return item;
113-
}
114-
}
115-
return null;
116-
}
117-
118-
}
1+
package tpi.dgrv4.entity.exceptions;
2+
3+
/**
4+
* 定義Return Code
5+
* Tip: 錯誤盡可能地定義明確，以避免定義過多模糊的錯誤，例如下載檔案失敗，可以明確指出是因為檔案不存在而造成的。
6+
*/
7+
public enum DgrRtnCode implements DgrError<DgrException> {
8+
_0125(DgrModule.DP0,"25","API不存在"),
9+
SUCCESS(DgrModule.DP, "00", "成功"),
10+
NO_FILE(DgrModule.DP, "29", "查無檔案"),
11+
_1191(DgrModule.DP, "91", "資料已被異動"),
12+
SYSTEM_ERROR(DgrModule.DP, "99", "系統錯誤"),
13+
_1202(DgrModule.DP2, "02", "查無類型清單"),
14+
_1219(DgrModule.DP2, "19", "Permission denied"), //沒有權限, John: 這裡要用英文 shutdown API 會用到
15+
_1227(DgrModule.DP2, "27", "生效日期不可小於今天"),
16+
_1230(DgrModule.DP2, "30", "角色不存在"),
17+
_1231(DgrModule.DP2, "31", "使用者不存在"),
18+
_1239(DgrModule.DP2, "39", "角色代號重複"),
19+
_1240(DgrModule.DP2, "40", "角色名稱重複"),
20+
_1241(DgrModule.DP2, "41", "功能不存在 (含locale)"),
21+
_1251(DgrModule.DP2, "51", "當前排程狀態不允許異動"),
22+
_1261(DgrModule.DP2, "61", "狀態:必填參數"),
23+
_1264(DgrModule.DP2, "64", "登入角色不存在"),
24+
_1284(DgrModule.DP2, "84", "[{{0}}] 不得重複"),
25+
_1285(DgrModule.DP2, "85", "Return code 參數不符合多國語系定義"),
26+
_1286(DgrModule.DP2, "86", "更新失敗"),
27+
_1287(DgrModule.DP2, "87", "刪除失敗"),
28+
_1289(DgrModule.DP2, "89", "查無 locale [{{0}}] 的 rtn code [{{1}}] 訊息"),
29+
_1288(DgrModule.DP2, "88", "新增失敗"),
30+
_1290(DgrModule.DP2, "90", "參數錯誤"),
31+
_1292(DgrModule.DP2, "92", "工作佇列已滿, 請稍後再執行"),
32+
_1293(DgrModule.DP2, "93", "資料庫錯誤"),
33+
_1295(DgrModule.DP2, "95", "日期格式不正確"),
34+
_1296(DgrModule.DP2, "96", "缺少必填參數"),
35+
_1297(DgrModule.DP2, "97", "執行錯誤"),
36+
_1298(DgrModule.DP2, "98", "查無資料"),
37+
_1300(DgrModule.DP3, "00", "角色代號:長度限制 [{{0}}] 字內，您輸入[{{1}}] 個字"),
38+
_1301(DgrModule.DP3, "01", "角色代號:只能輸入英文字母(a~z,A~Z)及數字且不含空白"),
39+
_1302(DgrModule.DP3, "02", "角色名稱:長度限制 [{{0}}] 字內，您輸入[{{1}}] 個字"),
40+
_1309(DgrModule.DP3, "09", "功能清單:必填參數"),
41+
_1344(DgrModule.DP3, "44", "用戶端不存在"),
42+
_1350(DgrModule.DP3, "50", "[{{0}}] 為必填欄位"),
43+
_1351(DgrModule.DP3, "51", "[{{0}}] 長度限制 [{{1}}] 字內，您輸入[{{2}}] 個字"),
44+
_1352(DgrModule.DP3, "52", "[{{0}}] 格式不正確"),
45+
_1355(DgrModule.DP3, "55", "[{{0}}] 不得小於 {{1}}, 您輸入 {{2}}"),
46+
_1356(DgrModule.DP3, "56", "[{{0}}] 不得大於 {{1}}, 您輸入 {{2}}"),
47+
_1357(DgrModule.DP3, "57", "您的角色並未授權使用 API txID [{{0}}]"),
48+
_1384(DgrModule.DP3, "84", "[{{0}}] 長度至少須 [{{1}}] 字，您輸入[{{2}}] 個字"),
49+
_1406(DgrModule.DP4, "06", "[{{0}}] 數量不可少於 [{{1}}]，您選擇 [{{2}}]"),
50+
_1407(DgrModule.DP4, "07", "[{{0}}] 數量不可超過 [{{1}}]，您選擇 [{{2}}]"),
51+
_1410(DgrModule.DP4, "10", "群組[{{0}}]不存在"),
52+
_1433(DgrModule.DP4, "33", "非對稱式加密失敗：[{{0}}]"),
53+
_1434(DgrModule.DP4, "34", "非對稱式解密失敗：[{{0}}]"),
54+
_1472(DgrModule.DP4, "72", "使用者已鎖定"),
55+
_1474(DgrModule.DP4, "74", "設定檔缺少參數 [{{0}}]"),
56+
_1491(DgrModule.DP4, "91", "執行工作不存在: {{0}}"),
57+
_1510(DgrModule.DP5, "10", "驗證失敗"),
58+
_1511(DgrModule.DP5, "11", "LDAP未啟用"),
59+
_1512(DgrModule.DP5, "12", "連線失敗"),
60+
_1514(DgrModule.DP5, "14", "您所在的網段,無法登入"),
61+
_1515(DgrModule.DP5, "15", "單個用戶不能存在於多個群組中"),
62+
_1516(DgrModule.DP5, "16", "使用者沒有任何群組"),
63+
_1541(DgrModule.DP5, "41", "Token已失效"),
64+
65+
_1566(DgrModule.DP5, "66", "結束日期不可小於開始日期"),
66+
67+
68+
_2000(DgrModule.DP10, "00", "必填"),
69+
_2001(DgrModule.DP10, "01", "最大長度為 [{{0}}]"),
70+
_2002(DgrModule.DP10, "02", "最小長度為 [{{0}}]"),
71+
_2003(DgrModule.DP10, "03", "必須包含 [{{0}}]"),
72+
_2004(DgrModule.DP10, "04", "不得包含 [{{0}}]"),
73+
_2005(DgrModule.DP10, "05", "數值不可大於 [{{0}}]"),
74+
_2006(DgrModule.DP10, "06", "數值不可小於 [{{0}}]"),
75+
_2007(DgrModule.DP10, "07", "格式不正確"),
76+
_2008(DgrModule.DP10, "08", "僅可輸入英數字、底線「_」及橫線「-」"),
77+
_2009(DgrModule.DP10, "09", "最少選擇 [{{0}}] 項"),
78+
_2010(DgrModule.DP10, "10", "最多選擇 [{{0}}] 項"),
79+
_1497(DgrModule.DP4, "97", "介接規格錯誤：[{{0}}] - [{{1}}]"),
80+
_9901(DgrModule.DP99, "01", "System error"),
81+
_9906(DgrModule.DP99, "06", "Client requests exceeds TPS limit"),
82+
_9912(DgrModule.DP99, "12", "API was disabled"),
83+
_9926(DgrModule.DP99, "26", "Invalid Character"),
84+
_9930(DgrModule.DP99, "30", "Invalid String"),
85+
_9978(DgrModule.DP99, "78", "不合法的 Host Header"),
86+
;
87+
88+
private DgrModule module;
89+
private String seq;
90+
private String defaultMessage;
91+
92+
private DgrRtnCode(DgrModule module, String seq, String defaultMessage) {
93+
this.module = module;
94+
this.seq = seq;
95+
this.defaultMessage = defaultMessage;
96+
}
97+
98+
@Override
99+
public DgrModule getModule() {
100+
return this.module;
101+
}
102+
103+
@Override
104+
public String getSeq() {
105+
return this.seq;
106+
}
107+
108+
@Override
109+
public String getDefaultMessage() {
110+
return this.defaultMessage;
111+
}
112+
113+
public static DgrRtnCode parse(String code) {
114+
for(DgrRtnCode item : DgrRtnCode.values()) {
115+
if(item.getCode().equals(code)) {
116+
return item;
117+
}
118+
}
119+
return null;
120+
}
121+
122+
}

‎dgrv4_Gateway_serv/src/main/java/tpi/dgrv4/dpaa/component/apptJob/DpaaAlertDetectorJobKeyword.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ public class DpaaAlertDetectorJobKeyword extends DpaaAlertDetectorJob<DpaaAlertD
4444

4545
private TsmpSettingService tsmpSettingService;
4646

47+
//Will be created through DpaaJobConfig, Autowired may not be used
48+
//會經過DpaaJobConfig來建立,Autowired可能沒用
4749
@Autowired
4850
public DpaaAlertDetectorJobKeyword(TsmpDpApptJob tsmpDpApptJob, ObjectMapper objectMapper,
4951
ApptJobDispatcher apptJobDispatcher, TsmpDpApptJobDao tsmpDpApptJobDao,

‎dgrv4_Gateway_serv/src/main/java/tpi/dgrv4/dpaa/config/DpaaJobConfig.java‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.springframework.context.annotation.Bean;
88
import org.springframework.context.annotation.Configuration;
99
import org.springframework.context.annotation.Scope;
10+
import org.springframework.lang.Nullable;
1011
import org.springframework.scheduling.annotation.EnableScheduling;
1112

1213
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -17,6 +18,10 @@
1718
import tpi.dgrv4.common.constant.HttpType;
1819
import tpi.dgrv4.dpaa.component.ApiHelper_TSMP;
1920
import tpi.dgrv4.dpaa.component.TsmpInvokeHelper;
21+
import tpi.dgrv4.dpaa.component.alert.DpaaAlertDispatcherJobHelper;
22+
import tpi.dgrv4.dpaa.component.alert.DpaaAlertNotifierCustom;
23+
import tpi.dgrv4.dpaa.component.alert.DpaaAlertNotifierLine;
24+
import tpi.dgrv4.dpaa.component.alert.DpaaAlertNotifierRoleEmail;
2025
import tpi.dgrv4.dpaa.component.apptJob.ApiApplicationJob;
2126
import tpi.dgrv4.dpaa.component.apptJob.ApiOffJob;
2227
import tpi.dgrv4.dpaa.component.apptJob.ApiOnJob;
@@ -74,6 +79,7 @@
7479
import tpi.dgrv4.dpaa.component.nodeTask.CleanCacheByTableNameNotifier;
7580
import tpi.dgrv4.dpaa.component.req.DpReqServiceFactory;
7681
import tpi.dgrv4.dpaa.component.rjob.ThinkpowerArticleJob;
82+
import tpi.dgrv4.dpaa.es.DgrESService;
7783
import tpi.dgrv4.dpaa.service.DgrAuditLogService;
7884
import tpi.dgrv4.dpaa.service.HandleDashboardDataByYearService;
7985
import tpi.dgrv4.dpaa.service.HandleDashboardDataService;
@@ -239,6 +245,13 @@ public class DpaaJobConfig {
239245
private final tpi.dgrv4.gateway.service.TsmpSettingService getwayTsmpSettingService;
240246
private final DgrAuditLogMDao dgrAuditLogMDao;
241247
private final DgrAuditLogDDao dgrAuditLogDDao;
248+
private final DpaaAlertNotifierRoleEmail dpaaAlertNotifierRoleEmail;
249+
private final DpaaAlertNotifierLine dpaaAlertNotifierLine;
250+
private final DpaaAlertNotifierCustom dpaaAlertNotifierCustom;
251+
private final DpaaAlertDispatcherJobHelper dpaaAlertDispatcherJobHelper;
252+
@Nullable
253+
private final DgrESService dgrESService;
254+
242255

243256
@Autowired
244257
private void setSendOpenApiKeyExpiringMailService() {
@@ -651,14 +664,16 @@ public DpaaAlertJob_Line apptJob_DPAA_ALERT_LINE(TsmpDpApptJob job) {
651664
@Scope("prototype")
652665
public DpaaAlertDetectorJobKeyword apptJob_RUNLOOP_ALERT_KEYWORD(TsmpDpApptJob job) throws Exception {
653666
ObjectMapper om = beanConfig.objectMapper();
654-
return new DpaaAlertDetectorJobKeyword(job, om, this.apptJobDispatcher, this.tsmpDpApptJobDao, null, null, null, null, null, null, tsmpSettingService);
667+
return new DpaaAlertDetectorJobKeyword(job, om, this.apptJobDispatcher, this.tsmpDpApptJobDao, dpaaAlertNotifierRoleEmail, dpaaAlertNotifierLine, dpaaAlertNotifierCustom,
668+
dpaaAlertDispatcherJobHelper, tsmpAlertDao, dgrESService, tsmpSettingService);
655669
}
656670

657671
@Bean
658672
@Scope("prototype")
659673
public DpaaAlertDetectorJobSystemBasic apptJob_RUNLOOP_ALERT_SYSTEM_BASIC(TsmpDpApptJob job) throws Exception {
660674
ObjectMapper om = beanConfig.objectMapper();
661-
return new DpaaAlertDetectorJobSystemBasic(job, om, this.apptJobDispatcher, this.tsmpDpApptJobDao, null, null, null, null, null);
675+
return new DpaaAlertDetectorJobSystemBasic(job, om, this.apptJobDispatcher, this.tsmpDpApptJobDao, dpaaAlertNotifierRoleEmail, dpaaAlertNotifierLine, dpaaAlertNotifierCustom,
676+
dpaaAlertDispatcherJobHelper, tsmpAlertDao);
662677
}
663678

664679
@Bean

‎dgrv4_Gateway_serv/src/main/java/tpi/dgrv4/dpaa/es/EsHttpClient.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ private EsHttpClient() {
5252
TPILogger.tl.error(StackTraceUtil.logTpiShortStackTrace(e));
5353
}
5454

55+
// "1 threads.....HttpClient-32909-SelectorManager" generated by the following PoolingHttpClientConnectionManager object.
56+
// format: HttpClient-{sequential-number}-SelectorManager
5557
PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager(registry);
5658
cm.setMaxTotal(4);
5759
cm.setDefaultMaxPerRoute(2);

‎dgrv4_Gateway_serv/src/main/java/tpi/dgrv4/dpaa/service/DPB0292Service.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@ protected void validateTlsCertificates(DPB0292Req req) {
136136
if (req.getTrustedCertsContent() != null && !req.getTrustedCertsContent().isEmpty()) {
137137
boolean isValid = tlsCertificateManager.validateCertificate(req.getTrustedCertsContent());
138138
if (!isValid) {
139-
throw TsmpDpAaRtnCode._1297.throwing("信任的 CA 證書無效");
139+
//throw TsmpDpAaRtnCode._1297.throwing("信任的 CA 證書無效");
140+
throw TsmpDpAaRtnCode._1352.throwing("{{trustedCertsContent}}");
140141
}
141142
}
142143

0 commit comments

Comments
 (0)