From c50039f9356589a47d86d882899ab1db20bf1528 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Tue, 16 Apr 2024 17:49:15 +0900 Subject: [PATCH] =?UTF-8?q?propertis=20=EC=A0=95=EB=A6=AC=20=EB=AF=B8?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=20class=20=EC=82=AD=EC=A0=9C.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kcscbackend/search/SearchController.java | 1 - .../kcscbackend/search/model/DocContent.java | 25 ----------- .../kcscbackend/search/model/DocIndex.java | 23 ----------- .../kcscbackend/search/model/DocTitle.java | 21 ---------- .../search/service/SearchService.java | 14 ++++--- .../main/resources/application-dev.properties | 4 +- .../resources/application-local.properties | 41 ------------------- .../resources/application-prod.properties | 6 +-- .../resources/application-test.properties | 15 ++++--- .../main/resources/application-dev.properties | 3 -- .../resources/application-prod.properties | 3 -- .../src/main/resources/application.properties | 4 ++ 12 files changed, 26 insertions(+), 134 deletions(-) delete mode 100644 kcsc-back-end/src/main/java/com/dbnt/kcscbackend/search/model/DocContent.java delete mode 100644 kcsc-back-end/src/main/java/com/dbnt/kcscbackend/search/model/DocIndex.java delete mode 100644 kcsc-back-end/src/main/java/com/dbnt/kcscbackend/search/model/DocTitle.java delete mode 100644 kcsc-back-end/src/main/resources/application-local.properties delete mode 100644 kcsc-opensearch/src/main/resources/application-dev.properties delete mode 100644 kcsc-opensearch/src/main/resources/application-prod.properties diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/search/SearchController.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/search/SearchController.java index 14fda3b..0eac27b 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/search/SearchController.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/search/SearchController.java @@ -1,6 +1,5 @@ package com.dbnt.kcscbackend.search; -import com.dbnt.kcscbackend.search.model.DocTitle; import com.dbnt.kcscbackend.search.service.SearchService; import lombok.RequiredArgsConstructor; import org.json.simple.JSONArray; diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/search/model/DocContent.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/search/model/DocContent.java deleted file mode 100644 index fe67d02..0000000 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/search/model/DocContent.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.dbnt.kcscbackend.search.model; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor - -public class DocContent { - - private Integer id; - - private String kcscCd; - - private String docNm; - - private String docYr; - - private String groupTitle; - - private String tableContent; - -} diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/search/model/DocIndex.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/search/model/DocIndex.java deleted file mode 100644 index f314f5a..0000000 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/search/model/DocIndex.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.dbnt.kcscbackend.search.model; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -public class DocIndex { - - private Integer id; - - private String kcscCd; - - private String docNm; - - private String docYr; - - private String groupTitle; - - -} diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/search/model/DocTitle.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/search/model/DocTitle.java deleted file mode 100644 index db3b2d8..0000000 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/search/model/DocTitle.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.dbnt.kcscbackend.search.model; - - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -public class DocTitle { - - private Integer id; - - private String kcscCd; - - private String docNm; - - private String docYr; - -} diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/search/service/SearchService.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/search/service/SearchService.java index 5e5795c..126a01f 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/search/service/SearchService.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/search/service/SearchService.java @@ -10,6 +10,7 @@ import org.apache.hc.core5.http.ParseException; import org.apache.hc.core5.http.io.entity.EntityUtils; import org.json.simple.JSONArray; import org.json.simple.parser.JSONParser; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.io.IOException; @@ -19,19 +20,20 @@ import java.nio.charset.StandardCharsets; @Service @RequiredArgsConstructor public class SearchService { - + @Value("${kcsc.opensearch.url}") + protected String kcscOpensearchUrl; public JSONArray searchRequest(String target, String text, Integer pageNum, Integer pageSize) { - String uri = "http://192.168.0.89:8090"; + String url = kcscOpensearchUrl; switch (target){ - case "title": uri+="/doc-search/doc-title?";break; - case "index": uri+="/doc-search/doc-index?";break; - case "content": uri+="/doc-search/doc-content?";break; + case "title": url+="/doc-search/doc-title?";break; + case "index": url+="/doc-search/doc-index?";break; + case "content": url+="/doc-search/doc-content?";break; } String param = "searchText="+URLEncoder.encode(text, StandardCharsets.UTF_8)+"&pageNum="+pageNum+"&pageSize="+pageSize; try{ CloseableHttpClient httpClient = HttpClients.createDefault(); - HttpGet httpGet = new HttpGet(uri+param); + HttpGet httpGet = new HttpGet(url+param); httpGet.addHeader("User-Agent", "Mozilla/5.0"); httpGet.addHeader("Content-type", "application/json;charset=UTF-8"); CloseableHttpResponse httpResponse = httpClient.execute(httpGet); diff --git a/kcsc-back-end/src/main/resources/application-dev.properties b/kcsc-back-end/src/main/resources/application-dev.properties index 1d463c0..828b8e1 100644 --- a/kcsc-back-end/src/main/resources/application-dev.properties +++ b/kcsc-back-end/src/main/resources/application-dev.properties @@ -37,4 +37,6 @@ Globals.addedOptions=false #JWT # redisConfig spring.redis.host=localhost -spring.redis.port=6379 \ No newline at end of file +spring.redis.port=6379 + +kcsc.opensearch.url=http://192.168.0.89:8090 \ No newline at end of file diff --git a/kcsc-back-end/src/main/resources/application-local.properties b/kcsc-back-end/src/main/resources/application-local.properties deleted file mode 100644 index 20ab5a8..0000000 --- a/kcsc-back-end/src/main/resources/application-local.properties +++ /dev/null @@ -1,41 +0,0 @@ - -# Access-Control-Allow-Origin -Globals.Allow.Origin = http://localhost:3000 - - -spring.devtools.livereload.enabled=true -#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=net.sf.log4jdbc.sql.jdbcapi.DriverSpy -#spring.datasource.url=jdbc:log4jdbc:postgresql://118.219.150.34:50654/kcsc -#spring.datasource.username=kcsc -#spring.datasource.password=dbnt0928! -spring.datasource.driverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy -#spring.datasource.url=jdbc:log4jdbc:postgresql://127.0.0.1:5432/kcsc -spring.datasource.url=jdbc:log4jdbc:postgresql://118.219.150.34:50503/kcsc -spring.datasource.username=dbnt0031 -spring.datasource.password=dbnt0928! - - -#jpa -spring.jpa.show-sql=true -spring.jpa.generate-ddl=false -spring.jpa.hibernate.naming.physical-strategy = org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl -spring.jpa.properties.hibernate.proc.param_null_passing=true -spring.jpa.properties.hibernate.jdbc.time_zone=Asia/Seoul - - - -# 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=TRACE - -# File Config -Globals.posblAtchFileSize=5242880 -Globals.fileStorePath=D:\\kcscUploadFiles -Globals.addedOptions=false \ No newline at end of file diff --git a/kcsc-back-end/src/main/resources/application-prod.properties b/kcsc-back-end/src/main/resources/application-prod.properties index 336ddca..4c0c55c 100644 --- a/kcsc-back-end/src/main/resources/application-prod.properties +++ b/kcsc-back-end/src/main/resources/application-prod.properties @@ -1,3 +1,4 @@ +# ??? ? ?? ?? properties ?? ?? ? ?? ??. # Access-Control-Allow-Origin Globals.Allow.Origin = https://back.dbnt.co.kr @@ -37,7 +38,4 @@ Globals.posblAtchFileSize=5242880 Globals.fileStorePath=/kcscUploadFiles Globals.addedOptions=false -#JWT -# redisConfig -spring.redis.host=localhost -spring.redis.port=6479 \ No newline at end of file +kcsc.opensearch.url=http://192.168.0.89:8090 \ No newline at end of file diff --git a/kcsc-back-end/src/main/resources/application-test.properties b/kcsc-back-end/src/main/resources/application-test.properties index 806fec5..4d6c377 100644 --- a/kcsc-back-end/src/main/resources/application-test.properties +++ b/kcsc-back-end/src/main/resources/application-test.properties @@ -1,8 +1,9 @@ +# dbnt ?? ??? ?? properties # Access-Control-Allow-Origin -Globals.Allow.Origin = http://118.219.150.34:50590/ +Globals.Allow.Origin = https://back.dbnt.co.kr -server.port=8088 +server.port=8080 spring.devtools.livereload.enabled=false server.error.path=/errors @@ -16,8 +17,8 @@ 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.username=kcsc +spring.datasource.url=jdbc:postgresql://118.219.150.34:50503/kcsc +spring.datasource.username=dbnt0031 spring.datasource.password=dbnt0928! #jpa @@ -34,5 +35,7 @@ logging.level.com.atoz_develop.mybatissample.repository=info # File Config Globals.posblAtchFileSize=5242880 -Globals.fileStorePath=D:\\kcscUploadFiles -Globals.addedOptions=false \ No newline at end of file +Globals.fileStorePath=/kcscUploadFiles +Globals.addedOptions=false + +kcsc.opensearch.url=http://192.168.0.89:8090 diff --git a/kcsc-opensearch/src/main/resources/application-dev.properties b/kcsc-opensearch/src/main/resources/application-dev.properties deleted file mode 100644 index 0126223..0000000 --- a/kcsc-opensearch/src/main/resources/application-dev.properties +++ /dev/null @@ -1,3 +0,0 @@ -opensearch.uris=https://localhost:9200 -opensearch.username=admin -opensearch.password=kpbP7ECsaTlgvfmaGNBtORH75QHf7TmJhHZdW7Z7 \ No newline at end of file diff --git a/kcsc-opensearch/src/main/resources/application-prod.properties b/kcsc-opensearch/src/main/resources/application-prod.properties deleted file mode 100644 index 8f4c3c1..0000000 --- a/kcsc-opensearch/src/main/resources/application-prod.properties +++ /dev/null @@ -1,3 +0,0 @@ -opensearch.uris=https://kcsc.dbnt.co.kr:9200 -opensearch.username=admin -opensearch.password=kpbP7ECsaTlgvfmaGNBtORH75QHf7TmJhHZdW7Z7 \ No newline at end of file diff --git a/kcsc-opensearch/src/main/resources/application.properties b/kcsc-opensearch/src/main/resources/application.properties index 0a755b0..dd21969 100644 --- a/kcsc-opensearch/src/main/resources/application.properties +++ b/kcsc-opensearch/src/main/resources/application.properties @@ -1,6 +1,10 @@ spring.application.name=kcsc-opensearch server.port=8090 +opensearch.uris=https://localhost:9200 +opensearch.username=admin +opensearch.password=kpbP7ECsaTlgvfmaGNBtORH75QHf7TmJhHZdW7Z7 + spring.datasource-kcsc.driverClassName=org.postgresql.Driver spring.datasource-kcsc.jdbcUrl=jdbc:postgresql://118.219.150.34:50503/kcsc spring.datasource-kcsc.username=dbnt0031