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

RMS/src/main/java/cn/cslg/report/common/model/PASPatentVO.java

@@ -91,6 +91,7 @@ public class PASPatentVO extends BaseVO {
     private List<Integer> importTaskId;
     private List<String> patentNos;
     private List<String> notInPatentNos;
+    private Integer reportId;
     @Data
     public static class Sort {
         private String order;

RMS/src/main/java/cn/cslg/report/service/OutInterfaceService.java

@@ -548,8 +548,14 @@ public class OutInterfaceService {
 
     public String getPatentListFromPAS(PASPatentVO params) throws IOException {
         OkHttpClient okHttpClient = new OkHttpClient();
+        Report report =reportService.getById(params.getReportId());
+        params.setProjectId(report.getProjectId());
+        LambdaQueryWrapper<ImportTask> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ImportTask::getReportId, params.getReportId());
         String param = new Gson().toJson(params);
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
+        List<ImportTask> importTasks = importTaskService.list(queryWrapper);
+        List<Integer> taskIds = importTasks.stream().map(ImportTask::getId).collect(Collectors.toList());
         Request request = new Request.Builder()
                 .url(PASUrl + "/api/v2/patent/list")
 //                .addHeader("Cookie", LoginUtils.getToken())

RMS/src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
   redis:
-    host: 47.101.137.223
+    host: 192.168.1.24
     port: 6379
-    database: 9
+    database: 3
     password: Xx0GWxdWQJxx6Swe
     lettuce:
       pool:
@@ -12,23 +12,23 @@ spring:
         max-wait: -1ms
     timeout: 2000ms
   datasource:
-    url: jdbc:mysql://47.101.137.223:3306/RMS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://192.168.1.24:3306/RMS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
-    password: TU5x6IeBi7rl
+    password: rrzTwWAYX8Gxh5JH
     dynamic:
       primary: rms
       datasource:
         pas:
-          url: jdbc:mysql://47.101.137.223:3306/pas?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+          url: jdbc:mysql://192.168.1.24:3306/pas?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
           driver-class-name: com.mysql.cj.jdbc.Driver
           username: root
-          password: TU5x6IeBi7rl
+          password: rrzTwWAYX8Gxh5JH
         rms:
-          url: jdbc:mysql://47.101.137.223:3306/RMS_PROD?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+          url: jdbc:mysql://192.168.1.24:3306/RMS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
           driver-class-name: com.mysql.cj.jdbc.Driver
           username: root
-          password: TU5x6IeBi7rl
+          password: rrzTwWAYX8Gxh5JH
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       stat-view-servlet:
@@ -37,9 +37,9 @@ spring:
       web-stat-filter:
         exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
 queueName: mail.queue
-RMSFile:  http://139.224.24.90:8011
-PASFile: http://139.224.24.90:8011
+RMSFile:  http://192.168.1.24:8011
+PASFile: http://192.168.1.24:8011
 PCSUrl: http://localhost:8871
 PASUrl: http://localhost:8877
-PCS: http://139.224.24.90:81
-PAS: http://139.224.24.90:80
+PCS: http://192.168.1.24:81
+PAS: http://192.168.1.24:80

RMS/src/main/resources/application-prod.yml

@@ -1,6 +1,6 @@
 spring:
   redis:
-    host: 47.101.137.223
+    host: 172.27.247.174
     port: 6379
     database: 3
     password: Xx0GWxdWQJxx6Swe
@@ -10,19 +10,39 @@ spring:
         max-idle: 20
         min-idle: 0
         max-wait: -1ms
-      timeout: 2000ms
+    timeout: 2000ms
   datasource:
-    url: jdbc:mysql://47.101.137.223:3306/pas-prod?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://172.27.247.174:3306/RMS_PROD?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: TU5x6IeBi7rl
-    driver-class-name: com.mysql.cj.jdbc.Driver
+    dynamic:
+      primary: rms
+      datasource:
+        pas:
+          url: jdbc:mysql://47.101.137.223:3306/pas-history?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          username: root
+          password: TU5x6IeBi7rl
+        rms:
+          url: jdbc:mysql://47.101.137.223:3306/RMS_PROD?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          username: root
+          password: TU5x6IeBi7rl
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       stat-view-servlet:
         login-username: admin
-        login-password: Cslg2022+
+        login-password: 123456
       web-stat-filter:
         exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
 springdoc:
   api-docs:
-    enabled: false
+    enabled: false
+queueName: emailProd.queue
+RMSFile:  http://139.224.24.90:8084
+PASFile: http://139.224.24.90:8011
+PCSUrl: http://localhost:8871
+PASUrl: http://localhost:8877
+PCS: http://139.224.24.90:81
+PAS: http://139.224.24.90:80

RMS/src/main/resources/application-prod2.0.yml

@@ -1,48 +0,0 @@
-spring:
-  redis:
-    host: 172.27.247.174
-    port: 6379
-    database: 3
-    password: Xx0GWxdWQJxx6Swe
-    lettuce:
-      pool:
-        max-active: 20
-        max-idle: 20
-        min-idle: 0
-        max-wait: -1ms
-    timeout: 2000ms
-  datasource:
-    url: jdbc:mysql://172.27.247.174:3306/RMS_PROD?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    username: root
-    password: TU5x6IeBi7rl
-    dynamic:
-      primary: rms
-      datasource:
-        pas:
-          url: jdbc:mysql://47.101.137.223:3306/pas-history?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          username: root
-          password: TU5x6IeBi7rl
-        rms:
-          url: jdbc:mysql://47.101.137.223:3306/RMS_PROD?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          username: root
-          password: TU5x6IeBi7rl
-    type: com.alibaba.druid.pool.DruidDataSource
-    druid:
-      stat-view-servlet:
-        login-username: admin
-        login-password: 123456
-      web-stat-filter:
-        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-springdoc:
-  api-docs:
-    enabled: false
-queueName: emailProd.queue
-RMSFile:  http://139.224.24.90:8084
-PASFile: http://139.224.24.90:8011
-PCSUrl: http://localhost:8871
-PASUrl: http://localhost:8877
-PCS: http://139.224.24.90:81
-PAS: http://139.224.24.90:80

RMS/src/main/resources/application-test.yml

@@ -1,8 +1,8 @@
 spring:
   redis:
-    host: 47.101.137.223
+    host: 192.168.1.24
     port: 6379
-    database: 9
+    database: 3
     password: Xx0GWxdWQJxx6Swe
     lettuce:
       pool:
@@ -10,25 +10,25 @@ spring:
         max-idle: 20
         min-idle: 0
         max-wait: -1ms
-      timeout: 2000ms
+    timeout: 2000ms
   datasource:
-    url: jdbc:mysql://47.101.137.223:3306/RMS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://192.168.1.24:3306/RMS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
-    password: TU5x6IeBi7rl
+    password: rrzTwWAYX8Gxh5JH
     dynamic:
       primary: rms
       datasource:
         pas:
-          url: jdbc:mysql://47.101.137.223:3306/pas?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+          url: jdbc:mysql://192.168.1.24:3306/pas?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
           driver-class-name: com.mysql.cj.jdbc.Driver
           username: root
-          password: TU5x6IeBi7rl
+          password: rrzTwWAYX8Gxh5JH
         rms:
-          url: jdbc:mysql://47.101.137.223:3306/RMS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+          url: jdbc:mysql://192.168.1.24:3306/RMS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
           driver-class-name: com.mysql.cj.jdbc.Driver
           username: root
-          password: TU5x6IeBi7rl
+          password: rrzTwWAYX8Gxh5JH
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       stat-view-servlet:
@@ -36,5 +36,10 @@ spring:
         login-password: 123456
       web-stat-filter:
         exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-queueName: mailTest.queue
-fileURL:  http://139.224.24.90:8082
+queueName: mail.queue
+RMSFile:  http://192.168.1.24:8011
+PASFile: http://192.168.1.24:8011
+PCSUrl: http://localhost:8871
+PASUrl: http://localhost:8877
+PCS: http://192.168.1.24:81
+PAS: http://192.168.1.24:80

RMS/src/main/resources/application.yml

@@ -43,7 +43,7 @@ spring:
       max-file-size: 1000MB
       max-request-size: 1000MB
   profiles:
-    active: dev
+    active: local
   jackson:
     default-property-inclusion: non_null
     serialization: