Skip to content

Commit 491c983

Browse files
swbyunswbyun
authored
Merge pull request #339 from experdb/develop
VERSION 14.0.1 RELEASE
2 parents 9259ac4 + ccfe717 commit 491c983

17 files changed

Lines changed: 139 additions & 32 deletions

File tree

‎eXperDB-Management-WebConsole/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>com.k4m</groupId>
66
<artifactId>eXperDB-Management-WebConsole</artifactId>
77
<packaging>war</packaging>
8-
<version>v14.0.0</version>
8+
<version>v14.0.1</version>
99
<name>eXperDB-Management-WebConsole</name>
1010
<url>http://www.egovframe.go.kr</url>
1111

‎eXperDB-Management-WebConsole/src/main/java/com/k4m/dx/tcontrol/cmmn/WebConsoleSetting.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class WebConsoleSetting {
1515

1616
public static void main(String[] args) throws Exception {
1717
String strLanguage ="";
18-
String strVersion ="eXperDB-Management-WebConsole-14.0.0";
18+
String strVersion ="eXperDB-Management-WebConsole-14.0.1";
1919

2020
String strDatabaseIp = "";
2121
String strDatabasePort = "";

‎eXperDB-Management-WebConsole/src/main/java/com/k4m/dx/tcontrol/db2pg/setting/service/DDLConfigVO.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,16 @@ public class DDLConfigVO {
3333
private int exrt_trg_tb_total_cnt;
3434
private int exrt_exct_tb_total_cnt;
3535

36+
private boolean src_index_origin;
37+
38+
public boolean getSrc_index_origin() {
39+
return src_index_origin;
40+
}
41+
42+
public void setSrc_index_origin(boolean src_index_origin) {
43+
this.src_index_origin = src_index_origin;
44+
}
45+
3646
public int getExrt_trg_tb_total_cnt() {
3747
return exrt_trg_tb_total_cnt;
3848
}

‎eXperDB-Management-WebConsole/src/main/java/com/k4m/dx/tcontrol/db2pg/setting/web/Db2pgConfigController.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ public static JSONObject createDDLConfig(JSONObject configObj) throws IOExceptio
5252
fileContent = fileContent.replaceAll("SRC_CLASSIFY_STRING=original", "SRC_CLASSIFY_STRING="+configObj.get("src_classify_string").toString());
5353
fileContent = fileContent.replaceAll("SRC_TABLE_DDL=TRUE", "SRC_TABLE_DDL="+configObj.get("src_table_ddl").toString());
5454
fileContent = fileContent.replaceAll("SRC_FILE_OUTPUT_PATH=./", "SRC_FILE_OUTPUT_PATH="+configObj.get("src_file_output_path").toString());
55+
fileContent = fileContent.replaceAll("SRC_INDEX_ORIGIN=FALSE", "SRC_INDEX_ORIGIN="+configObj.get("src_index_origin").toString().toUpperCase());
5556
bw.write(fileContent + "\r\n");
5657
bw.flush();
5758
}

‎eXperDB-Management-WebConsole/src/main/java/com/k4m/dx/tcontrol/db2pg/setting/web/Db2pgSettingController.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,7 @@ public ModelAndView ddlRegForm(HttpServletRequest request, @ModelAttribute("hist
305305
configObj.put("src_file_output_path", ddl_path);
306306
configObj.put("src_include_tables", src_include_tables);
307307
configObj.put("src_exclude_tables", src_exclude_tables);
308+
configObj.put("src_index_origin", ddlConfigVO.getSrc_index_origin());
308309

309310
result = Db2pgConfigController.createDDLConfig(configObj);
310311
} catch (Exception e) {
@@ -366,6 +367,7 @@ public ModelAndView ddlRegForm(HttpServletRequest request, @ModelAttribute("hist
366367
targetDDLWork.setDb2pg_exrt_exct_tb_wrk_id(sourceDDLWork.getDb2pg_exrt_exct_tb_wrk_id());
367368
targetDDLWork.setFrst_regr_id(id);
368369
targetDDLWork.setLst_mdfr_id(id);
370+
targetDDLWork.setSrc_index_origin(sourceDDLWork.getSrc_index_origin());
369371
db2pgSettingService.insertDDLWork(targetDDLWork);
370372

371373
//5.config 생성
@@ -386,6 +388,7 @@ public ModelAndView ddlRegForm(HttpServletRequest request, @ModelAttribute("hist
386388
configObj.put("src_file_output_path", ddl_path);
387389
configObj.put("src_include_tables", sourceDDLWork.getExrt_trg_tb_nm()==null?"":sourceDDLWork.getExrt_trg_tb_nm());
388390
configObj.put("src_exclude_tables", sourceDDLWork.getExrt_exct_tb_nm()==null?"":sourceDDLWork.getExrt_exct_tb_nm());
391+
configObj.put("src_index_origin", sourceDDLWork.getSrc_index_origin());
389392

390393
result = Db2pgConfigController.createDDLConfig(configObj);
391394
} catch (Exception e) {
@@ -431,6 +434,8 @@ public ModelAndView ddlRegReForm(HttpServletRequest request, @ModelAttribute("hi
431434
mv.addObject("exrt_exct_tb_cnt", result.getExrt_exct_tb_cnt());
432435
mv.addObject("exrt_trg_tb_total_cnt", result.getExrt_trg_tb_total_cnt());
433436
mv.addObject("exrt_exct_tb_total_cnt", result.getExrt_exct_tb_total_cnt());
437+
String getSrc_index_origin = String.valueOf(result.getSrc_index_origin()).toUpperCase();
438+
mv.addObject("src_index_origin", getSrc_index_origin);
434439

435440
List<CodeVO> codeLetter = db2pgSettingService.selectCode("TC0028");
436441
mv.addObject("codeLetter", codeLetter);
@@ -525,6 +530,7 @@ public ModelAndView ddlRegReForm(HttpServletRequest request, @ModelAttribute("hi
525530
configObj.put("src_file_output_path", ddl_path);
526531
configObj.put("src_include_tables", src_include_tables);
527532
configObj.put("src_exclude_tables", src_exclude_tables);
533+
configObj.put("src_index_origin", ddlConfigVO.getSrc_index_origin());
528534

529535
result = Db2pgConfigController.createDDLConfig(configObj);
530536
} catch (Exception e) {

‎eXperDB-Management-WebConsole/src/main/java/com/k4m/dx/tcontrol/db2pg/setting/web/db2pg.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ SRC_INCLUDE_DATA_EXPORT=FALSE
2525
## Specifies Whether to perform schema extraction of the source DBMS
2626
SRC_DDL_EXPORT=FALSE
2727

28+
SRC_INDEX_ORIGIN=FALSE
29+
2830
## Source DBMS Connection Information
2931
SRC_HOST=
3032
SRC_USER=

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.k4m.dx.tcontrol.encrypt.service.call;
22

3+
import java.io.UnsupportedEncodingException;
34
import java.text.SimpleDateFormat;
45
import java.util.ArrayList;
56
import java.util.Date;
@@ -290,8 +291,18 @@ public JSONObject selectProfileProtectionContents(String lang, String restIp, in
290291
result.put("denyResultTypeCode", profileProtection.getDenyResultTypeCode());
291292
System.out.println(profileProtection.getDataTypeCode()); //dataTypeCode 데이터 타입
292293
result.put("dataTypeCode", profileProtection.getDataTypeCode());
293-
System.out.println(profileProtection.getMaskingValue()); //대체 문자열
294-
result.put("maskingValue", profileProtection.getMaskingValue());
294+
295+
if(profileProtection.getMaskingValue() != null) {
296+
System.out.println( new String(profileProtection.getMaskingValue().getBytes("iso-8859-1"), "utf-8")); //대체 문자열
297+
result.put("maskingValue", new String(profileProtection.getMaskingValue().getBytes("iso-8859-1"), "utf-8"));
298+
}else {
299+
System.out.println(profileProtection.getMaskingValue()); //대체 문자열
300+
result.put("maskingValue", profileProtection.getMaskingValue());
301+
}
302+
303+
304+
305+
295306

296307
JSONArray arrProfileCipherSpec = (JSONArray) map.get("ProfileCipherSpec");
297308
System.out.println(" ################# ProfileCipherSpec ################### ");

‎eXperDB-Management-WebConsole/src/main/resources/egovframework/sql/latest/eXperDB-Management_14.0.1.sql‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
-- 컬럼추가 (DDL 출력시, 기존 형식 유지에 대한 옵션 )
2+
ALTER TABLE t_db2pg_ddl_wrk_inf ADD COLUMN src_index_origin bool NULL;
3+
4+
5+
6+
7+

‎eXperDB-Management-WebConsole/src/main/resources/egovframework/sql/latest/eXperDB-Management_RepoDB-Install.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if [ $1 == "A" ]; then
77
fi
88

99
echo "****************************************************"
10-
echo "eXperDB-Management-14.0.0 Repository DB Install"
10+
echo "eXperDB-Management-14.0.1 Repository DB Install"
1111
echo "****************************************************"
1212

1313
echo "**CREATE USER experdb**"
@@ -94,6 +94,10 @@ echo "**13.0.6**"
9494
psql -U experdb -d experdb -f eXperDB-Management_13.0.6.sql
9595
echo "**13.0.6 END**"
9696

97+
echo "**14.0.1**"
98+
psql -U experdb -d experdb -f eXperDB-Management_14.0.1.sql
99+
echo "**14.0.1 END**"
100+
97101
#항상 마지막에 backup sql 수행 (등록 DB가 다름)
98102
echo "**bnr backup**"
99103
psql -U experdb -d experdb -f create_new_backup.sql

‎eXperDB-Management-WebConsole/src/main/resources/egovframework/sql/v14.0.1/eXperDB-Management_14.0.1.sql‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
-- 컬럼추가 (DDL 출력시, 기존 형식 유지에 대한 옵션 )
2+
ALTER TABLE t_db2pg_ddl_wrk_inf ADD COLUMN src_index_origin bool NULL;
3+
4+
5+
6+
7+

0 commit comments

Comments
 (0)