Merge branch 'dev' into feature-integrated_with_JCPP

jsowell-admin/src/main/resources/application-prd.yml

@@ -88,7 +88,7 @@ spring:
 
   # rabbitmq配置 prd
   rabbitmq:
-    host: 47.103.124.69
+    host: 172.23.0.187
     port: 5672
     username: admin
     password: js160829@
@@ -265,7 +265,7 @@ dubbo:
     name: wcc-server
     qosEnable: false
   registry:
-    address: nacos://47.103.124.69:8848
+    address: nacos://172.23.0.187:8848
     parameters:
       namespace: 1c0429d3-2842-45a9-b3f3-11605c3fd06e
     username: nacos

jsowell-admin/src/main/resources/application-pre.yml

@@ -9,7 +9,7 @@ spring:
   redis:
     # 地址
     host: r-uf6k0uet7mihr5z78f.redis.rds.aliyuncs.com
-#    host: 47.117.244.159
+#    host: 172.23.0.190
     # 端口，默认为6379
     port: 6379
     # 数据库索引
@@ -41,7 +41,7 @@ spring:
         url: jdbc:mysql://rm-uf6ra51u33dc3798l.mysql.rds.aliyuncs.com:3306/jsowell_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: jsowell
         password: js@160829
-#        url: jdbc:mysql://47.117.244.159:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#        url: jdbc:mysql://172.23.0.190:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #        username: jsowell_pre
 #        password: Js@160829
       # 从库数据源
@@ -92,11 +92,29 @@ spring:
             multi-statement-allow: true
 
   # rabbitmq配置 pre
+#  rabbitmq:
+#    host: 172.23.0.190
+#    port: 5672
+#    username: guest
+#    password: guest
+#    #这个配置是保证提供者确保消息推送到交换机中，不管成不成功，都会回调
+#    publisher-confirm-type: correlated
+#    #保证交换机能把消息推送到队列中
+#    publisher-returns: true
+#    virtual-host: /
+#    #这个配置是保证消费者会消费消息，手动确认
+#    listener:
+#      simple:
+#        acknowledge-mode: manual
+#    template:
+#      mandatory: true
+
+  # rabbitmq配置 prd
   rabbitmq:
-    host: 47.117.244.159
+    host: 172.23.0.187
     port: 5672
-    username: guest
-    password: guest
+    username: admin
+    password: js160829@
     #这个配置是保证提供者确保消息推送到交换机中，不管成不成功，都会回调
     publisher-confirm-type: correlated
     #保证交换机能把消息推送到队列中
@@ -270,7 +288,7 @@ dubbo:
     name: wcc-server
     qosEnable: false
   registry:
-    address: nacos://47.117.244.159:8848
+    address: nacos://172.23.0.190:8848
     parameters:
       namespace: c95d1cb4-8d46-48b5-9982-a6942c28e953
     username: nacos