Merge branch 'master' of http://118.219.150.34:50501/DBNT/kcscDev

# Conflicts:
#	egovframe-template-simple-react-contribution/package-lock.json

egovframe-template-simple-react-contribution/.env.production

@@ -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

egovframe-template-simple-react-contribution/package.json

@@ -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",

egovframe-template-simple-react-contribution/src/css/base.css

@@ -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;}

egovframe-template-simple-react-contribution/src/pages/standardCode/viewer.js

@@ -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>
                         )

kcsc-back-end/src/main/resources/application-prod.properties

@@ -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!