7/29 未登录报错全局修改

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

@@ -56,7 +56,7 @@ public class  ElasticSearchClientConfig {
         public ElasticsearchClient elasticsearchClient() throws Exception {
             RestClientBuilder builder = RestClient.builder(new HttpHost(config, 9200, "http"));
             CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-            credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials("elastic", "xiaoshi221101"));
+            credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials("elastic", "Xiaoshi221101"));
             SSLContext sslContext = SSLContextBuilder.create()
                     .loadTrustMaterial(new TrustSelfSignedStrategy())
                     .build();

src/main/java/cn/cslg/pas/service/exportProject/SavePatentToEsService.java

@@ -91,12 +91,14 @@ public class SavePatentToEsService {
         if (patent.getPatentNo().startsWith("CN")) {
             if (patent.getPublicNo() != null) {
                 if (patent.getPublicNo().endsWith("B")) {
+                    publicNo=null;
                     grantNo = patent.getPublicNo();
                 }
             }
             if (patent.getGrantNo() != null) {
                 if (patent.getGrantNo().endsWith("A")) {
                     publicNo = patent.getGrantNo();
+                    grantNo =null;
                 }
             }
 

src/main/resources/application.yml

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