diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 84cee1b..f20a313 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,9 +1,8 @@ name: Java Publish on: - push: - branches: - - master + release: + types: [published] jobs: build: diff --git a/application/pom.xml b/application/pom.xml index 453bcfd..3a72fc6 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -10,7 +10,7 @@ com.canehealth.ckblib ckblib-application - 0.10.0 + 0.11.0 ckblib-application Demo project for Spring Boot diff --git a/graph/pom.xml b/graph/pom.xml index f6cd7d5..162fcc3 100644 --- a/graph/pom.xml +++ b/graph/pom.xml @@ -10,7 +10,7 @@ com.canehealth.ckblib graph - 0.10.0 + 0.11.0 ckblib-graph Demo project for Spring Boot diff --git a/library/pom.xml b/library/pom.xml index 54452cf..4a593f5 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -10,7 +10,7 @@ com.canehealth.ckblib library - 0.10.0 + 0.11.0 ckblib-library Demo project for Spring Boot diff --git a/library/src/main/java/com/canehealth/ckblib/library/model/BaseQuery.java b/library/src/main/java/com/canehealth/ckblib/library/model/BaseQuery.java index da5f1da..0ae8339 100644 --- a/library/src/main/java/com/canehealth/ckblib/library/model/BaseQuery.java +++ b/library/src/main/java/com/canehealth/ckblib/library/model/BaseQuery.java @@ -13,6 +13,7 @@ public class BaseQuery { private int retmax = 10; private int reldate = 0; private int retstart = 0; + private String api_key = ""; public String getQuery() { String query = "?retmode=json&db=" + db + "&term=" + term + "&retmax=" + Integer.toString(retmax); @@ -22,6 +23,9 @@ public String getQuery() { if (retstart > 0) { query += "&retstart=" + Integer.toString(retstart); } + if(!"".equals(api_key)){ + query += "&api_key=" + api_key; + } return query.replace(" ", "+"); } diff --git a/library/src/main/java/com/canehealth/ckblib/library/service/CkbEfetch.java b/library/src/main/java/com/canehealth/ckblib/library/service/CkbEfetch.java index 9a1cabc..e5585ba 100644 --- a/library/src/main/java/com/canehealth/ckblib/library/service/CkbEfetch.java +++ b/library/src/main/java/com/canehealth/ckblib/library/service/CkbEfetch.java @@ -17,6 +17,7 @@ import org.w3c.dom.Node; import lombok.Getter; +import lombok.Setter; import reactor.core.publisher.Mono; @Service @@ -31,10 +32,12 @@ public class CkbEfetch { private WebClient webClient; + @Setter List esearch_results = new ArrayList(); @Getter + @Setter List results = new ArrayList(); public CkbEfetch() { diff --git a/library/src/main/java/com/canehealth/ckblib/library/service/CkbEsearch.java b/library/src/main/java/com/canehealth/ckblib/library/service/CkbEsearch.java index 3f157d7..fa32d2c 100644 --- a/library/src/main/java/com/canehealth/ckblib/library/service/CkbEsearch.java +++ b/library/src/main/java/com/canehealth/ckblib/library/service/CkbEsearch.java @@ -27,6 +27,7 @@ public class CkbEsearch { private WebClient webClient; @Getter + @Setter List results = new ArrayList(); public CkbEsearch() { diff --git a/pom-deploy.xml b/pom-deploy.xml index 4078330..233e4cb 100644 --- a/pom-deploy.xml +++ b/pom-deploy.xml @@ -4,7 +4,7 @@ com.canehealth.ckblib cklib-core - 0.10.0 + 0.11.0 pom diff --git a/pom.xml b/pom.xml index d3c4721..669894f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.canehealth.ckblib cklib-core - 0.10.0 + 0.11.0 pom diff --git a/qtakes/pom.xml b/qtakes/pom.xml index d591a11..7cf5567 100644 --- a/qtakes/pom.xml +++ b/qtakes/pom.xml @@ -10,7 +10,7 @@ com.canehealth.ckblib qtakes - 0.10.0 + 0.11.0 ckblib-qtakes Demo project for Spring Boot