use new rest page impl

seecoder-bok-client/src/main/java/cn/seecoder/bok/client/SeecoderBokClient.java

@@ -37,7 +37,6 @@ public class SeecoderBokClient
     private final OkHttpClient client;
     private final ObjectMapper mapper;
 
-    private final int CONFIG_PAGE_START;
     private final String CONFIG_HOST;
 
     /**
@@ -46,12 +45,7 @@ public class SeecoderBokClient
      * @param host bok地址，示例：{@code "http://bok.seecoder.cn"}
      */
     public SeecoderBokClient(String host) {
-        this(host, 0);
-    }
-
-    public SeecoderBokClient(String host, int pageStart) {
-        this.CONFIG_HOST = host;
-        this.CONFIG_PAGE_START = pageStart;
+        CONFIG_HOST = host;
         client = new OkHttpClient();
         mapper = JsonMapper.builder()
                 .addModule(new ParameterNamesModule())
@@ -145,11 +139,7 @@ public class SeecoderBokClient
         HttpUrl httpUrl = addPageableToParams(urlBuilder, pageable).build();
         Response response = get(httpUrl);
         return getResponseBody(response, new TypeReference<RestPage<RecordVO>>() {})
-                .map(recordVOS -> new PageImpl<>(
-                        recordVOS.getContent(),
-                        parseBokToPageable(recordVOS.getNumber(), recordVOS.getSize(), pageable),
-                        recordVOS.getTotalElements()))
-                .orElse(new PageImpl<>(Collections.emptyList()));
+                .orElse(new RestPage<>());
     }
 
     @Override
@@ -295,26 +285,10 @@ public class SeecoderBokClient
         }
     }
 
-    private int parsePageableNumberToBok(int pageNumber) {
-        return pageNumber - CONFIG_PAGE_START + SeecoderBokConstants.PAGE_START;
-    }
-
-    private int parseBokToPageableNumber(int bokPageNumber) {
-        return bokPageNumber - SeecoderBokConstants.PAGE_START + CONFIG_PAGE_START;
-    }
-
-    private Pageable parseBokToPageable(int page, int size, Pageable pageable) {
-        if (pageable == null) {
-            return PageRequest.of(parseBokToPageableNumber(page), size);
-        }
-        return pageable;
-    }
-
     private HttpUrl.Builder addPageableToParams(HttpUrl.Builder builder, Pageable pageable) {
         return Optional.ofNullable(pageable)
                 .map(notNullPageable ->
-                        // TODO: not accept error
-                        builder.addQueryParameter("page", String.valueOf(parsePageableNumberToBok(notNullPageable.getPageNumber()) + 1))
+                        builder.addQueryParameter("page", String.valueOf(notNullPageable.getPageNumber()))
                                 .addQueryParameter("sort", parseSort(notNullPageable.getSort()))
                                 .addQueryParameter("size", String.valueOf(notNullPageable.getPageSize()))
                 )

seecoder-bok-server/src/main/resources/application-dev.yml

@@ -0,0 +1,21 @@
+debug: true
+logging:
+  level:
+    tracer: trace
+    org:
+      elasticsearch:
+        client:
+          RestClient: trace
+
+spring:
+  jpa:
+    show-sql: true
+  datasource:
+    url: jdbc:postgresql://centos8.local:5432/bok
+    username: postgres
+    password: 12345678qwerQWER
+  elasticsearch:
+    rest:
+      uris: http://centos8.local:9200
+      username: elastic
+      password: 12345678qwerQWER

seecoder-bok-server/src/main/resources/application.yml

@@ -2,29 +2,8 @@ spring:
   jpa:
     database: postgresql
     open-in-view: false
-    show-sql: true
     hibernate:
       ddl-auto: update
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
-    url: jdbc:postgresql://192.168.254.129:5432/bok
-    username: postgres
-    password: 12345678qwerQWER
-  elasticsearch:
-    rest:
-      uris: http://192.168.254.129:9200
-      username: elastic
-      password: 12345678qwerQWER
 
-  jackson:
-    serialization:
-      WRITE_DATES_AS_TIMESTAMPS: false
-
-debug: true
-logging:
-  level:
-    tracer: trace
-    org:
-      elasticsearch:
-        client:
-          RestClient: trace