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/package.json

@@ -4,6 +4,7 @@
   "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",
@@ -44,6 +45,5 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
-  },
+  }
-  "proxy": "http://localhost:8080"
 }

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/StandardCodeController.java

@@ -17,10 +17,7 @@ import org.egovframe.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -47,7 +44,6 @@ public class StandardCodeController extends BaseController {
 
 	@Resource(name = "propertiesService")
 	protected EgovPropertyService propertyService;
-
 	private final StandardCodeService standardCodeService;
 
 
@@ -61,9 +57,8 @@ public class StandardCodeController extends BaseController {
 			@ApiResponse(responseCode = "200", description = "조회 성공"),
 			@ApiResponse(responseCode = "403", description = "인가된 사용자가 아님")
 	})
-	@PostMapping(value = "/getCodeTree.do", consumes = MediaType.APPLICATION_JSON_VALUE)
+	@RequestMapping(method = RequestMethod.POST, value = "/getCodeTree.do", consumes = MediaType.APPLICATION_JSON_VALUE)
-	public ResultVO getCodeTree(@RequestBody StandardCodeVO param, @AuthenticationPrincipal LoginVO user)
+	public ResultVO getCodeTree() throws Exception {
-			throws Exception {
 		ResultVO resultVO = new ResultVO();
 		Map<String, Object> resultMap = new HashMap<>();
 		resultMap.put("codeTree", standardCodeService.selectStandardCodeTree());

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/mapper/StandardCodeMapper.java

@@ -14,7 +14,7 @@ public interface StandardCodeMapper {
 
 	Integer selectStandardCodeListCnt(TnDocumentInfo tnDocumentInfo);
 
-    List<TnDocumentInfo> selectStandardCodeRevisionhistoryList(Integer groupseq);
+	List<TnDocumentInfo> selectStandardCodeRevisionhistoryList(Integer groupseq);
 
 	List<TnDocumentCodeList> selectStandardcodelist(String code);
 }

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/service/StandardCodeService.java

@@ -6,6 +6,7 @@ import com.dbnt.kcscbackend.standardCode.mapper.StandardCodeMapper;
 import com.dbnt.kcscbackend.standardCode.repository.TnDocumentContentRepository;
 import com.dbnt.kcscbackend.standardCode.repository.TnDocumentGroupRepository;
 import lombok.RequiredArgsConstructor;
+import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -14,7 +15,8 @@ import java.util.List;
 @Service
 @Transactional
 @RequiredArgsConstructor
-public class StandardCodeService {
+public class StandardCodeService extends EgovAbstractServiceImpl {
+
   private final TnDocumentGroupRepository tnDocumentGroupRepository;
   private final TnDocumentContentRepository tnDocumentContentRepository;
   private final StandardCodeMapper standardCodeMapper;
@@ -27,10 +29,6 @@ public class StandardCodeService {
     return tnDocumentContentRepository.getRecentFullContextByContent(param.getDocCode(), param.getDocPart());
   }
 
-  public List<TnDocumentInfo> selectStandardCodeList(TnDocumentInfo tnDocumentInfo) {
-    return standardCodeMapper.selectStandardCodeList(tnDocumentInfo);
-  }
-
   public Integer selectStandardCodeListCnt(TnDocumentInfo tnDocumentInfo) {
     return standardCodeMapper.selectStandardCodeListCnt(tnDocumentInfo);
   }

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

@@ -1,4 +1,7 @@
 
+# Access-Control-Allow-Origin
+Globals.Allow.Origin = http://localhost:3000
+
 spring.devtools.livereload.enabled=true
 #Datasource Configuration
 spring.sql.init.encoding=utf-8
@@ -6,9 +9,9 @@ spring.sql.init.encoding=utf-8
 spring.datasource.hikari.maximum-pool-size=4
 #postgresql
 spring.datasource.driverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-spring.datasource.url=jdbc:log4jdbc:postgresql://218.36.126.201:5432/kcscdb
+spring.datasource.url=jdbc:log4jdbc:postgresql://118.219.150.34:50654/kcsc
-spring.datasource.username=postgres
+spring.datasource.username=kcsc
-spring.datasource.password=rhksflwk12!@
+spring.datasource.password=dbnt0928!
 
 #jpa
 spring.jpa.show-sql=true

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

@@ -0,0 +1,37 @@
+
+# Access-Control-Allow-Origin
+Globals.Allow.Origin = http://118.219.150.34:50680/
+
+server.port=50688
+
+spring.devtools.livereload.enabled=false
+server.error.path=/errors
+
+logging.level.org.apache.tomcat: info
+logging.level.org.apache.catalina: info
+
+#Datasource Configuration
+spring.sql.init.encoding=utf-8
+#maximum-pool-size: CPU core count
+spring.datasource.hikari.maximum-pool-size=4
+#postgresql
+spring.datasource.driverClassName=org.postgresql.Driver
+spring.datasource.url=jdbc:postgresql://localhost/kcsc
+spring.datasource.username=kcsc
+spring.datasource.password=dbnt0928!
+
+#jpa
+spring.jpa.show-sql=false
+spring.jpa.generate-ddl=false
+spring.jpa.hibernate.naming.physical-strategy = org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+
+# MyBatis
+mybatis.mapper-locations: mybatisMapper/*.xml
+mybatis.configuration.map-underscore-to-camel-case=true
+mybatis.type-aliases-package=com.dbnt.kcscbackend.**.entity
+logging.level.com.atoz_develop.mybatissample.repository=info
+
+# File Config
+Globals.posblAtchFileSize=5242880
+Globals.fileStorePath=C:\\kcsc_web\\uploadedFile
+Globals.addedOptions=false

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

@@ -1,4 +1,7 @@
 
+# Access-Control-Allow-Origin
+Globals.Allow.Origin = http://118.219.150.34:50590/
+
 server.port=8088
 
 spring.devtools.livereload.enabled=false
@@ -13,9 +16,9 @@ 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://218.36.126.201:5432/kcscdb
+spring.datasource.url=jdbc:postgresql://localhost/kcsc
-spring.datasource.username=postgres
+spring.datasource.username=kcsc
-spring.datasource.password=rhksflwk12!@
+spring.datasource.password=dbnt0928!
 
 #jpa
 spring.jpa.show-sql=false

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

@@ -4,8 +4,5 @@ spring.mvc.pathmatch.matching-strategy=ant_path_matcher
 Globals.pageUnit=10
 Globals.pageSize=10
 
-# Access-Control-Allow-Origin
-Globals.Allow.Origin = http://localhost:3000
-
 #JWT secret key
 Globals.jwt.secret = egovframe