parent
cb9aff3e56
commit
c50039f935
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
}
|
||||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -37,4 +37,6 @@ Globals.addedOptions=false
|
|||
#JWT
|
||||
# redisConfig
|
||||
spring.redis.host=localhost
|
||||
spring.redis.port=6379
|
||||
spring.redis.port=6379
|
||||
|
||||
kcsc.opensearch.url=http://192.168.0.89:8090
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
kcsc.opensearch.url=http://192.168.0.89:8090
|
||||
|
|
@ -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
|
||||
Globals.fileStorePath=/kcscUploadFiles
|
||||
Globals.addedOptions=false
|
||||
|
||||
kcsc.opensearch.url=http://192.168.0.89:8090
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
opensearch.uris=https://localhost:9200
|
||||
opensearch.username=admin
|
||||
opensearch.password=kpbP7ECsaTlgvfmaGNBtORH75QHf7TmJhHZdW7Z7
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
opensearch.uris=https://kcsc.dbnt.co.kr:9200
|
||||
opensearch.username=admin
|
||||
opensearch.password=kpbP7ECsaTlgvfmaGNBtORH75QHf7TmJhHZdW7Z7
|
||||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue