Skip to content

Commit 5e8b9ab

Browse files
kayformkayform
authored
Merge pull request #269 from experdb/develop
[#267]
2 parents 745fd00 + eb2b3b2 commit 5e8b9ab

8 files changed

Lines changed: 96 additions & 96 deletions

File tree

‎eXperDB-Management-WebConsole/src/main/java/com/k4m/dx/tcontrol/encrypt/service/call/AgentMonitoringServiceCall.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,18 +77,18 @@ public JSONArray selectSystemStatus(String restIp, int restPort, String strTocke
7777
String resultLevel = systemStatus.getResultLevel();
7878
String logMessage = systemStatus.getLogMessage();
7979

80-
// System.out.println("serverLogDateTime : " + serverLogDateTime);
81-
// System.out.println("siteLogDateTime : " + siteLogDateTime);
82-
// System.out.println("monitoredAddress : " + monitoredAddress);
83-
// System.out.println("siteAccessAddress : " + siteAccessAddress);
84-
// System.out.println("monitoredUid : " + monitoredUid);
85-
// System.out.println("monitoredName : " + monitoredName);
86-
// System.out.println("targetType : " + targetType);
87-
// System.out.println("targetUid : " + targetUid );
88-
// System.out.println("targetName : " + targetName );
89-
// System.out.println("monitorType : " + monitorType );
90-
// System.out.println("resultLevel : " + resultLevel );
91-
// System.out.println("logMessage : " + logMessage );
80+
System.out.println("serverLogDateTime : " + serverLogDateTime);
81+
System.out.println("siteLogDateTime : " + siteLogDateTime);
82+
System.out.println("monitoredAddress : " + monitoredAddress);
83+
System.out.println("siteAccessAddress : " + siteAccessAddress);
84+
System.out.println("monitoredUid : " + monitoredUid);
85+
System.out.println("monitoredName : " + monitoredName);
86+
System.out.println("targetType : " + targetType);
87+
System.out.println("targetUid : " + targetUid );
88+
System.out.println("targetName : " + targetName );
89+
System.out.println("monitorType : " + monitorType );
90+
System.out.println("resultLevel : " + resultLevel );
91+
System.out.println("logMessage : " + logMessage );
9292

9393

9494

‎eXperDB-Management-WebConsole/src/main/java/com/k4m/dx/tcontrol/encrypt/service/call/AuditLogServiceCall.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ public JSONObject selectBackupLogList(String restIp, int restPort, String strToc
336336
jsonArray.add(jsonObj);
337337
}
338338
result.put("data", jsonArray);
339-
// System.out.println(result);
339+
System.out.println(result);
340340
}
341341
}
342342
return result;
@@ -407,7 +407,7 @@ public JSONObject selectSystemUsageLogList(String restIp, int restPort, String s
407407
jsonArray.add(jsonObj);
408408
}
409409
result.put("data", jsonArray);
410-
// System.out.println(result);
410+
System.out.println(result);
411411
}
412412
}
413413
return result;
@@ -484,7 +484,7 @@ public JSONArray selectEntityAgentList(String restIp, int restPort, String strTo
484484

485485
String parameters = TypeUtility.makeRequestBody(body);
486486

487-
// System.out.println(parameters);
487+
System.out.println(parameters);
488488

489489
HashMap header = new HashMap();
490490
header.put(SystemCode.FieldName.LOGIN_ID, loginId);
@@ -497,7 +497,7 @@ public JSONArray selectEntityAgentList(String restIp, int restPort, String strTo
497497
while (iter.hasNext()) {
498498
Map.Entry entry = (Map.Entry) iter.next();
499499

500-
// System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
500+
System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
501501
}
502502

503503

@@ -523,8 +523,8 @@ public JSONArray selectEntityAgentList(String restIp, int restPort, String strTo
523523

524524
jsonArray.add(jsonObj);
525525

526-
// System.out.println("getEntityUid : " + entity.getEntityUid());
527-
// System.out.println("getEntityName : " + new String(entity.getEntityName().toString().getBytes("iso-8859-1"),"UTF-8") );
526+
System.out.println("getEntityUid : " + entity.getEntityUid());
527+
System.out.println("getEntityName : " + new String(entity.getEntityName().toString().getBytes("iso-8859-1"),"UTF-8") );
528528
}
529529
}
530530

‎eXperDB-Management-WebConsole/src/main/java/com/k4m/dx/tcontrol/encrypt/service/call/CommonServiceCall.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public JSONArray selectSysCodeListExper(String restIp, int restPort, String strT
5757
while (iter.hasNext()) {
5858
Map.Entry entry = (Map.Entry) iter.next();
5959

60-
// System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
60+
System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
6161
}
6262

6363
String resultCode = (String) resultJson.get("resultCode");
@@ -150,7 +150,7 @@ public JSONObject selectServerStatus(String restIp, int restPort, String strTock
150150

151151

152152
System.out.println("resultCode : " + resultCode + " resultMessage : " + resultMessage);
153-
// System.out.println("isServerKeyEmpty : " + isServerKeyEmpty + " isServerPasswordEmpty : " + isServerPasswordEmpty);
153+
System.out.println("isServerKeyEmpty : " + isServerKeyEmpty + " isServerPasswordEmpty : " + isServerPasswordEmpty);
154154

155155
if(resultCode.equals(SystemCode.ResultCode.SUCCESS)) {
156156
jsonObj.put("resultCode", resultCode);
@@ -249,7 +249,7 @@ public JSONObject login(String restIp, int restPort, String loginId, String pass
249249
jsonObj.put("ectityUid", ectityUid);
250250
jsonObj.put("tockenValue", tockenValue);
251251

252-
// System.out.println("ectityUid : " + ectityUid + " tockenValue : " + tockenValue);
252+
System.out.println("ectityUid : " + ectityUid + " tockenValue : " + tockenValue);
253253

254254
String jsonString = loginEntity.getBody();
255255

@@ -296,7 +296,7 @@ public JSONArray selectEntityList2(String restIp, int restPort, String strTocken
296296

297297
String parameters = TypeUtility.makeRequestBody(body);
298298

299-
// System.out.println(parameters);
299+
System.out.println(parameters);
300300

301301
HashMap header = new HashMap();
302302
header.put(SystemCode.FieldName.LOGIN_ID, loginId);
@@ -309,7 +309,7 @@ public JSONArray selectEntityList2(String restIp, int restPort, String strTocken
309309
while (iter.hasNext()) {
310310
Map.Entry entry = (Map.Entry) iter.next();
311311

312-
// System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
312+
System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
313313
}
314314

315315

@@ -339,7 +339,7 @@ public JSONArray selectEntityList2(String restIp, int restPort, String strTocken
339339
jObj.put("resultMessage", resultMessage);
340340
jObj.put("getEntityUid", entity.getEntityUid());
341341

342-
// System.out.println("getEntityUid : " + entity.getEntityUid());
342+
System.out.println("getEntityUid : " + entity.getEntityUid());
343343
System.out.println("getEntityName : " + new String(entity.getEntityName().toString().getBytes("iso-8859-1"),"UTF-8") );
344344

345345
jsonArray.add(jObj);

‎eXperDB-Management-WebConsole/src/main/java/com/k4m/dx/tcontrol/encrypt/service/call/EncryptSettingServiceCall.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public JSONObject selectSysConfigListLike(String restIp, int restPort, String st
8282

8383
String strConfigKey = (String) jsonObj.get("configKey");
8484
String strConfigValue = (String) jsonObj.get("configValue");
85-
// System.out.println("strConfigKey : " + strConfigKey + " - strConfigValue : " + strConfigValue);
85+
System.out.println("strConfigKey : " + strConfigKey + " - strConfigValue : " + strConfigValue);
8686

8787
result.put("list", jsonArray);
8888
}
@@ -151,7 +151,7 @@ public JSONObject selectSysMultiValueConfigListLike(String restIp, int restPort,
151151
BigDecimal bdValueNumber2 = sysMultiValueConfig.getValueNumber2();
152152

153153

154-
// System.out.println("strConfigKey : " + strConfigKey);
154+
System.out.println("strConfigKey : " + strConfigKey);
155155
if(strConfigKey.equals(SystemCode.SysConfigKey.BATCH_LOG_CONF)) {
156156

157157
//1. 암복호화 로그를 지정되 시간에만 수집 체크박스 체크여부 = blnIsvalueTrueFalse
@@ -306,7 +306,7 @@ public JSONObject updateSysConfigList(String restIp, int restPort, String strToc
306306
while (iter1.hasNext()) {
307307
Map.Entry entry = (Map.Entry) iter1.next();
308308

309-
// System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
309+
System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
310310
}
311311

312312
String resultCode = (String) resultJson1.get("resultCode");
@@ -402,7 +402,7 @@ public JSONObject updateSysMultiValueConfigList(String restIp, int restPort, Str
402402
while (iter1.hasNext()) {
403403
Map.Entry entry = (Map.Entry) iter1.next();
404404

405-
// System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
405+
System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
406406
}
407407

408408
String resultCode = (String) resultJson1.get("resultCode");
@@ -472,7 +472,7 @@ public JSONObject selectSysMultiValueConfigListLike2(String restIp, int restPort
472472
BigDecimal bdValueNumber = sysMultiValueConfig.getValueNumber();
473473
BigDecimal bdValueNumber2 = sysMultiValueConfig.getValueNumber2();
474474

475-
// System.out.println("strConfigKey : " + strConfigKey);
475+
System.out.println("strConfigKey : " + strConfigKey);
476476
if(strConfigKey.equals(SystemCode.SysConfigKey.MONITOR_POLLING_SERVER)) {
477477
System.out.println("관리서버 모니터링 주기 : " + bdValueNumber);
478478
jObj.put("MONITOR_POLLING_SERVER", bdValueNumber);
@@ -599,7 +599,7 @@ public JSONObject updateSysMultiValueConfigList2(String restIp, int restPort, St
599599
while (iter1.hasNext()) {
600600
Map.Entry entry = (Map.Entry) iter1.next();
601601

602-
// System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
602+
System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
603603
}
604604

605605
String resultCode = (String) resultJson1.get("resultCode");
@@ -709,7 +709,7 @@ public JSONObject selectAgentMonitoring(String restIp, int restPort, String strT
709709

710710
String parameters = TypeUtility.makeRequestBody(body);
711711

712-
// System.out.println(parameters);
712+
System.out.println(parameters);
713713

714714
HashMap header = new HashMap();
715715
header.put(SystemCode.FieldName.LOGIN_ID, loginId);
@@ -722,7 +722,7 @@ public JSONObject selectAgentMonitoring(String restIp, int restPort, String strT
722722
while (iter.hasNext()) {
723723
Map.Entry entry = (Map.Entry) iter.next();
724724

725-
// System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
725+
System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
726726
}
727727

728728

@@ -769,11 +769,11 @@ public JSONObject selectAgentMonitoring(String restIp, int restPort, String strT
769769

770770
jsonArray.add(jsonObj);
771771

772-
// result.put("list", jsonArray);
772+
result.put("list", jsonArray);
773773
result.put("resultCode", resultCode);
774774
result.put("resultMessage", resultMessage);
775-
// System.out.println("getEntityUid : " + entity.getEntityUid());
776-
// System.out.println("getEntityName : " + new String(entity.getEntityName().toString().getBytes("iso-8859-1"),"UTF-8") );
775+
System.out.println("getEntityUid : " + entity.getEntityUid());
776+
System.out.println("getEntityName : " + new String(entity.getEntityName().toString().getBytes("iso-8859-1"),"UTF-8") );
777777
}
778778
}
779779
result.put("resultCode", resultCode);
@@ -808,7 +808,7 @@ public JSONArray selectParamSysCodeList(String restIp, int restPort, String strT
808808

809809
String parameters = TypeUtility.makeRequestBody(body);
810810

811-
// System.out.println(parameters);
811+
System.out.println(parameters);
812812

813813
HashMap header = new HashMap();
814814
header.put(SystemCode.FieldName.LOGIN_ID, loginId);
@@ -821,7 +821,7 @@ public JSONArray selectParamSysCodeList(String restIp, int restPort, String strT
821821
while (iter.hasNext()) {
822822
Map.Entry entry = (Map.Entry) iter.next();
823823

824-
// System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
824+
System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
825825
}
826826

827827
String resultCode = (String) resultJson.get("resultCode");
@@ -900,7 +900,7 @@ public JSONObject updateEntity(String restIp, int restPort, String strTocken, St
900900
while (iter.hasNext()) {
901901
Map.Entry entry = (Map.Entry) iter.next();
902902

903-
// System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
903+
System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
904904
}
905905

906906

‎eXperDB-Management-WebConsole/src/main/java/com/k4m/dx/tcontrol/encrypt/service/call/KeyManageServiceCall.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public JSONObject selectCryptoKeyList(String restIp, int restPort, String strToc
5858
while (iter.hasNext()) {
5959
Map.Entry entry = (Map.Entry) iter.next();
6060

61-
// System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
61+
System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
6262
}
6363

6464

@@ -133,7 +133,7 @@ public JSONObject selectCryptoKeyList(String restIp, int restPort, String strToc
133133
System.out.println(bf.toString());
134134
}
135135
}
136-
// result.put("list", jsonArray);
136+
result.put("list", jsonArray);
137137
}
138138
result.put("resultCode", resultCode);
139139
result.put("resultMessage", resultMessage);
@@ -167,7 +167,7 @@ public JSONObject insertCryptoKeySymmetric(String restIp, int restPort, String s
167167
while (iter.hasNext()) {
168168
Map.Entry entry = (Map.Entry) iter.next();
169169

170-
// System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
170+
System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
171171
}
172172

173173

@@ -208,7 +208,7 @@ public JSONObject updateCryptoKeySymmetric(String restIp, int restPort, String s
208208
while (iter.hasNext()) {
209209
Map.Entry entry = (Map.Entry) iter.next();
210210

211-
// System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
211+
System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
212212
}
213213

214214

@@ -250,7 +250,7 @@ public JSONObject selectCryptoKeySymmetricList(String restIp, int restPort, Stri
250250
while (iter.hasNext()) {
251251
Map.Entry entry = (Map.Entry) iter.next();
252252

253-
// System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
253+
System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
254254
}
255255

256256
String resultCode = (String) resultJson.get("resultCode");
@@ -334,7 +334,7 @@ public JSONObject deleteCryptoKeySymmetric(String restIp, int restPort, String s
334334
while (iter.hasNext()) {
335335
Map.Entry entry = (Map.Entry) iter.next();
336336

337-
// System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
337+
System.out.println(String.valueOf(entry.getKey()) + " = " + String.valueOf(entry.getValue()));
338338
}
339339

340340

0 commit comments

Comments
 (0)