5/17 修改支付回调路径

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

@@ -46,7 +46,6 @@ import java.util.*;
 public class EsService {
     public final List<String> dateList = Arrays.asList("AD", "PD", "GD", "EXD", "PAD", "PED", "PPD", "EPD");
     private final ElasticsearchClient client;
-
     @Autowired
     private PatentStarApiService patentStarApiService;
     @Value("${ES.patentVector}")
@@ -255,7 +254,7 @@ public class EsService {
     public PatentVector getVectorByIndex(String patentNo,Integer index) throws Exception {
         SearchRequest.Builder builder = new SearchRequest.Builder();
         //设置查询索引
-        builder.index("patent_vector");
+        builder.index(patentVectorName);
         PatentVector patentVector = null;
         String id = null;
         Query q1 = QueryBuilders.term(t -> t.field("app_no").value(patentNo));

src/main/java/com/example/xiaoshiweixinback/service/weixinpay/WeixinPayService.java

@@ -48,7 +48,7 @@ public class WeixinPayService {
      * @return
      * @throws Exception
      */
-    public GetPayTicketVO getPayTickets(WeiXinPayDTO weiXinPayDTO) throws Exception {
+    public GetPayTicketVO  getPayTickets(WeiXinPayDTO weiXinPayDTO) throws Exception {
         GetPayTicketVO getPayTicketVO = new GetPayTicketVO();
         String url = "https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi";
         String tradeNo = BatchNoUtil.getOrderNo();

src/main/resources/application-prodNetIn2.yml

@@ -0,0 +1,87 @@
+spring:
+  rabbitmq:
+    host: 172.27.247.174
+    port: 5672
+    username: admin
+    password: 123456
+  data:
+   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/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
+    type: com.alibaba.druid.pool.DruidDataSource
+    druid:
+      stat-view-servlet:
+        login-username: admin
+        login-password: Cslg2022+
+      web-stat-filter:
+        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
+  quartz:
+    #相关属性配置
+    properties:
+      org:
+        quartz:
+          scheduler:
+            instanceName: DefaultQuartzScheduler
+            instanceId: AUTO
+          jobStore:
+            class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
+            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+            tablePrefix: QRTZ_
+            isClustered: false
+            clusterCheckinInterval: 10000
+            useProperties: false
+          threadPool:
+            class: org.quartz.simpl.SimpleThreadPool
+            threadCount: 10
+            threadPriority: 5
+            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
+              user: root
+              password: TU5x6IeBi7rl
+              driver: com.mysql.jdbc.Driver
+
+    #数据库方式
+    job-store-type: jdbc
+    #初始化表结构
+    jdbc:
+      initialize-schema: always
+authorUrl: http://localhost:8871
+PCSUrl: http://localhost:8871
+#OPSUrl: http://192.168.1.24:5001
+OPSUrl: http://139.224.24.90:5001
+PASUrl: http://localhost:8877
+FMSUrl: http://localhost:8802
+VectorUrl: http://172.17.106.72:8000
+FileSource: 5
+
+##################  短信 ####################
+SMS:
+  regionId: cn-shanghai
+  accessKeyId: LTAI5tGyG1Q7fKprgg1nWhXj
+  secret: Y6Erboh5lEFiRPR4XK8oCPMvUzYGLN
+
+##################  微信小程序  ####################
+WeChat:
+  appId: wxaefb842bd0b93ff0
+  appSecret: 89fe0fb96472548d48f63b2f5c956537
+Keypath: apiclient_key.pem
+ES:
+  patentVector: cn_patent_vector_v4
+  patent: cn_weixin_patent_v3
+  config: es-cn-em93o8856000ho9e7.elasticsearch.aliyuncs.com

src/main/resources/application-prodNetOut.yml

@@ -36,6 +36,6 @@ WeChat:
 Keypath: C:\Users\admin\Desktop\小程序证书\1673179188_20240408_cert\apiclient_key.pem
 queueName: emailProd.queue
 ES:
-  patentVector: patent_vector
-  patent: wxpatent
+  patentVector: cn_patent_vector_v4
+  patent: cn_weixin_patent_v3
   config: es-cn-em93o8856000ho9e7.public.elasticsearch.aliyuncs.com

src/main/resources/application.yml

@@ -20,7 +20,7 @@ spring:
       max-file-size: 1000MB
       max-request-size: 1000MB
   profiles:
-    active: prodNetIn
+    active: prodNetIn2
   jackson:
     default-property-inclusion: non_null
     serialization: