Merge remote-tracking branch 'origin/master'

cks
dbnt-design 2023-11-15 11:04:46 +09:00
commit b3fef8a79f
6 changed files with 61 additions and 4 deletions

View File

@ -4,7 +4,7 @@
NODE_PATH=src/
## 절대경로 지정
REACT_APP_EGOV_CONTEXT_URL=127.0.0.1:8080
REACT_APP_EGOV_CONTEXT_URL=118.219.150.34:50688
## [보안] 소스맵 삭제
GENERATE_SOURCEMAP=false

View File

@ -8,6 +8,7 @@
"name": "template.web.boot.simple.homepage",
"version": "0.1.0",
"dependencies": {
"axios": "^1.6.1",
"bootstrap": "^5.3.2",
"http-proxy-middleware": "^2.0.6",
"qs": "^6.11.0",
@ -5058,6 +5059,29 @@
"node": ">=4"
}
},
"node_modules/axios": {
"version": "1.6.1",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.6.1.tgz",
"integrity": "sha512-vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g==",
"dependencies": {
"follow-redirects": "^1.15.0",
"form-data": "^4.0.0",
"proxy-from-env": "^1.1.0"
}
},
"node_modules/axios/node_modules/form-data": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
"dependencies": {
"asynckit": "^0.4.0",
"combined-stream": "^1.0.8",
"mime-types": "^2.1.12"
},
"engines": {
"node": ">= 6"
}
},
"node_modules/axobject-query": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz",
@ -13963,6 +13987,11 @@
"node": ">= 0.10"
}
},
"node_modules/proxy-from-env": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
},
"node_modules/psl": {
"version": "1.9.0",
"resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
@ -20921,6 +20950,28 @@
"resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.6.3.tgz",
"integrity": "sha512-/BQzOX780JhsxDnPpH4ZiyrJAzcd8AfzFPkv+89veFSr1rcMjuq2JDCwypKaPeB6ljHp9KjXhPpjgCvQlWYuqg=="
},
"axios": {
"version": "1.6.1",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.6.1.tgz",
"integrity": "sha512-vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g==",
"requires": {
"follow-redirects": "^1.15.0",
"form-data": "^4.0.0",
"proxy-from-env": "^1.1.0"
},
"dependencies": {
"form-data": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
"requires": {
"asynckit": "^0.4.0",
"combined-stream": "^1.0.8",
"mime-types": "^2.1.12"
}
}
}
},
"axobject-query": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz",
@ -27362,6 +27413,11 @@
}
}
},
"proxy-from-env": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
},
"psl": {
"version": "1.9.0",
"resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",

View File

@ -4,7 +4,6 @@
"private": true,
"dependencies": {
"bootstrap": "^5.3.2",
"http-proxy-middleware": "^2.0.6",
"qs": "^6.11.0",
"react": "^18.2.0",
"react-bootstrap": "^2.9.0",

View File

@ -32,7 +32,8 @@ dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, thead, tb
blockquote, button, fieldset, iframe {border: 0;}
cite, em, u, address, i {font-style: normal;}
img {border: 0; vertical-align: top;}
hr, legend {position: absolute; left: -9999px; top: -9999px;}
hr{margin: 0}
legend {position: absolute; left: -9999px; top: -9999px;}
/*caption {text-indent: -9999px; font-size: 0;}*/
li {list-style: none;}
table {width: 100%; table-layout: fixed; border-collapse: collapse;}

View File

@ -143,6 +143,7 @@ function CodeViewer(props) {
if(item.error_cd !== null){
item.full_content = "<div class='errorText'>"+item.error_cd+"</div>"+item.full_content;
}
item.full_content = item.full_content+"<hr>"
detailTag.push(
<VwDiv depth={item.cont_level} isTitle={isTitle} id={item.cont_type_cd} dangerouslySetInnerHTML={ {__html: item.full_content} }></VwDiv>
)

View File

@ -16,7 +16,7 @@ spring.sql.init.encoding=utf-8
spring.datasource.hikari.maximum-pool-size=4
#postgresql
spring.datasource.driverClassName=org.postgresql.Driver
spring.datasource.url=jdbc:postgresql://localhost/kcsc
spring.datasource.url=jdbc:postgresql://localhost:5432/kcsc
spring.datasource.username=kcsc
spring.datasource.password=dbnt0928!