Merge remote-tracking branch 'origin/importpatent' into importpatent

# Conflicts:
#	src/main/resources/application-localImport.yml

src/main/java/com/example/xiaoshiweixinback/service/importPatent/GetPatentPictureFromWebService.java

@@ -67,7 +67,7 @@ public class GetPatentPictureFromWebService {
                     Long e4 = System.currentTimeMillis();
                     System.out.println("下载文件耗时"+(e4-s4));
                     String guid = FormatUtil.getPictureFormat(patent.getAppNo()) + i;
-                    fileManagerService.uploadFileWithGuid(file, guid);
+//                    fileManagerService.uploadFileWithGuid(file, guid);
                     Long e1 = System.currentTimeMillis();
                     System.out.println("上传文件耗时"+(e1-s1));
                     System.out.println("P" + i);

src/main/resources/application-prodNetIn.yml

@@ -1,12 +1,12 @@
 spring:
   rabbitmq:
-    host: 172.27.247.174
+    host: 192.168.0.71
     port: 5672
     username: admin
     password: 123456
   data:
    redis:
-     host: 172.27.247.174
+     host: 192.168.0.71
      port: 6379
      database: 3
      password: Xx0GWxdWQJxx6Swe
@@ -18,7 +18,7 @@ spring:
          max-wait: -1ms
      timeout: 2000ms
   datasource:
-    url: jdbc:mysql://172.27.247.174:3306/ecs?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://192.168.0.71:3306/ecs?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     username: root
     password: TU5x6IeBi7rl
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -51,7 +51,7 @@ spring:
             threadsInheritContextClassLoaderOfInitializingThread: true
           dataSource:
             default:
-              URL: jdbc:mysql://172.27.247.174:3306:3306/pas-prod2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+              URL: jdbc:mysql://192.168.0.71:3306:3306/pas-prod2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
               user: root
               password: TU5x6IeBi7rl
               driver: com.mysql.jdbc.Driver

src/main/resources/application-prodNetIn2.yml

@@ -82,6 +82,7 @@ WeChat:
   appSecret: 89fe0fb96472548d48f63b2f5c956537
 Keypath: apiclient_key.pem
 ES:
-  patentVector: cn_patent_vector_v4
-  patent: cn_weixin_patent_v3
-  config: es-cn-em93o8856000ho9e7.elasticsearch.aliyuncs.com
+  patentVector: cn_patent_vector_v5
+  patent: cn_weixin_patent_v4
+  config: es-cn-em93o8856000ho9e7.elasticsearch.aliyuncs.com
+  password: Xiaoshi221101

src/main/resources/application.yml

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