1/29 修复bug

src/main/java/cn/cslg/pas/common/config/ElasticSearchClientConfig.java

@@ -27,27 +27,27 @@ public class ElasticSearchClientConfig {
     @Configuration
     public class ElasticSearchConfig {
         //注入IOC容器
-//        @Bean
-//        public ElasticsearchClient elasticsearchClient() throws Exception {
-//            RestClientBuilder builder = RestClient.builder(new HttpHost("192.168.1.24", 9200, "https"));
-//            CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-//            credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials("elastic", "xiaoshi221101"));
-//            SSLContext sslContext = SSLContextBuilder.create()
-//                    .loadTrustMaterial(new TrustSelfSignedStrategy())
-//                    .build();
-//            builder.setHttpClientConfigCallback(f -> f.setDefaultCredentialsProvider(credentialsProvider).setSSLContext(sslContext).setSSLHostnameVerifier(new NoopHostnameVerifier()));
-//            RestClient client =builder.build();
-//            ElasticsearchTransport transport = new RestClientTransport(client,new JacksonJsonpMapper());
-//            return new ElasticsearchClient(transport);
-//        }
-                @Bean
+        @Bean
         public ElasticsearchClient elasticsearchClient() throws Exception {
-            RestClientBuilder builder = RestClient.builder(new HttpHost("47.101.137.223", 9200, "http"));
+            RestClientBuilder builder = RestClient.builder(new HttpHost("192.168.1.24", 9200, "https"));
+            CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+            credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials("elastic", "xiaoshi221101"));
+            SSLContext sslContext = SSLContextBuilder.create()
+                    .loadTrustMaterial(new TrustSelfSignedStrategy())
+                    .build();
+            builder.setHttpClientConfigCallback(f -> f.setDefaultCredentialsProvider(credentialsProvider).setSSLContext(sslContext).setSSLHostnameVerifier(new NoopHostnameVerifier()));
             RestClient client =builder.build();
             ElasticsearchTransport transport = new RestClientTransport(client,new JacksonJsonpMapper());
-
-                    return new ElasticsearchClient(transport);
+            return new ElasticsearchClient(transport);
         }
+//                @Bean
+//        public ElasticsearchClient elasticsearchClient() throws Exception {
+//            RestClientBuilder builder = RestClient.builder(new HttpHost("47.101.137.223", 9200, "http"));
+//            RestClient client =builder.build();
+//            ElasticsearchTransport transport = new RestClientTransport(client,new JacksonJsonpMapper());
+//
+//                    return new ElasticsearchClient(transport);
+//        }
 
 
     }

src/main/java/cn/cslg/pas/factorys/getOrderFactory/GetCronsNameOrder.java

@@ -0,0 +1,34 @@
+package cn.cslg.pas.factorys.getOrderFactory;
+
+import cn.cslg.pas.common.utils.StringUtils;
+import cn.cslg.pas.service.business.SystemDictService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+@Slf4j
+@Component
+public class GetCronsNameOrder implements GetOrderObject {
+    @Autowired
+    private SystemDictService systemDictService;
+
+    @Override
+    public String getOrderString(String orderBy, Integer orderType) {
+        List<String> ids = new ArrayList<>();
+        //根据名称查询应用场景id
+        try {
+          ids = systemDictService.getCronsOrderIds(orderType);
+        } catch (Exception e) {
+        }
+        orderBy =" COALESCE("+orderBy+",'null')";
+        String idStr = StringUtils.join(ids, ",");
+        String orderStr = " field(" + orderBy + "," + idStr + ")";
+        String re = orderStr;
+        return re;
+    }
+
+}

src/main/java/cn/cslg/pas/service/importPatent/GetRightAndFullTextFromWebThread.java

@@ -111,7 +111,7 @@ public class GetRightAndFullTextFromWebThread extends Thread {
                 List<String> reClaims = new ArrayList<>();
                 element.forEach(item -> {
                     String claim = item.getText();
-                    claim =   claim.replaceAll("\r\n|\r|\n| ", "");
+                    claim =   claim.replaceAll("\r\n|\r|\n|\t| ", "");
                     reClaims.add(claim);
 
                 });

src/main/resources/application.yml

@@ -1,7 +1,7 @@
 server:
   servlet:
     context-path: /
-  port: 8879
+  port: 8877
 #  sa-token:
 #  activity-timeout: 18000
 #  token-name: token
@@ -20,7 +20,7 @@ spring:
       max-file-size: 1000MB
       max-request-size: 1000MB
   profiles:
-    active: testNetIn
+    active: dev
   jackson:
     default-property-inclusion: non_null
     serialization: