Merge remote-tracking branch 'origin/fix'

pom.xml

@@ -321,7 +321,7 @@
     </dependencies>
 
     <build>
-        <finalName>ECS_TEST</finalName>
+        <finalName>ECS_PROD</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

src/main/java/com/example/xiaoshiweixinback/factorys/goodFactory/GoodVipService.java

@@ -38,7 +38,7 @@ String personUuid =order.getPersonUuid();
      if(vip==null){
          throw  new BusinessException(ExceptionEnum.BUSINESS_ERROR,"会员不存在");
      }
-     totalPrice+=vip.getPrice();
+     totalPrice+=vip.getFinalPrice();
         return totalPrice;
     }
 }

src/main/resources/application-prodNetIn.yml

@@ -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://172.27.247.174:3306/ecs?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
               user: root
               password: TU5x6IeBi7rl
               driver: com.mysql.jdbc.Driver
@@ -84,4 +84,4 @@ Keypath: apiclient_key.pem
 ES:
   patentVector: patent_vector
   patent: wxpatent
-  config: es-cn-em93o8856000ho9e7.public.elasticsearch.aliyuncs.com
+  config: es-cn-em93o8856000ho9e7.elasticsearch.aliyuncs.com

src/main/resources/application-testNetIn.yml

@@ -1,7 +1,7 @@
 spring:
   rabbitmq:
     host: 172.27.247.174
-    port: 5672
+    port: 5673
     username: admin
     password: 123456
   data:
@@ -18,7 +18,7 @@ spring:
           max-wait: -1ms
       timeout: 2000ms
   datasource:
-    url: jdbc:mysql://172.27.247.174:3306/pas_prod2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://172.27.247.174:3306/ecs-test?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/pas_prod2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+              URL: jdbc:mysql://172.27.247.174:3306/ecs-test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
               user: root
               password: TU5x6IeBi7rl
               driver: com.mysql.jdbc.Driver
@@ -61,13 +61,14 @@ spring:
     #初始化表结构
     jdbc:
       initialize-schema: always
-authorUrl: http://localhost:8880
-PCSUrl: http://localhost:8880
+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:8880
-FMSUrl: http://localhost:8885
-FileSource: 3
+PASUrl: http://localhost:8877
+FMSUrl: http://localhost:8802
+VectorUrl: http://127.0.0.1:8000
+FileSource: 5
 
 ##################  短信 ####################
 SMS:
@@ -78,4 +79,9 @@ SMS:
 ##################  微信小程序  ####################
 WeChat:
   appId: wxaefb842bd0b93ff0
-  appSecret: 89fe0fb96472548d48f63b2f5c956537
+  appSecret: 89fe0fb96472548d48f63b2f5c956537
+Keypath: apiclient_key.pem
+ES:
+  patentVector: patent_vector_test
+  patent: wxpatent_test
+  config: es-cn-em93o8856000ho9e7.elasticsearch.aliyuncs.com

src/main/resources/application.yml

@@ -1,7 +1,7 @@
 server:
   servlet:
     context-path: /
-  port: 8902
+  port: 8901
 #  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: prodNetIn
   jackson:
     default-property-inclusion: non_null
     serialization:

src/main/resources/mapper/InviteMessageMapper.xml

@@ -9,7 +9,8 @@
         p.phone_num as phoneNum,
         p.email    as email,
         p.user_name as userName,
-        p.create_time as createTime
+        p.create_time as createTime,
+               im.if_buy_vip as ifBuyVip
         from invite_message im left join  person as p
              on im.invited_person_uuid = p.uuid