Merge branch 'master' of lvjian/ccnet-wx-mp3.0 into master

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'org.springframework.boot' version '2.7.2'
+    id 'org.springframework.boot' version '2.0.2.RELEASE'
 }
 
 apply plugin: 'java'

src/main/java/com/emato/ccnet/wx/rabbitMq/rabbitImpl/Ceb311OrderListenerImpl.java

@@ -7,10 +7,8 @@ import com.google.gson.Gson;
 import com.rabbitmq.client.Channel;
 import org.springframework.amqp.core.AcknowledgeMode;
 import org.springframework.amqp.core.Message;
-import org.springframework.amqp.core.Queue;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
+import org.springframework.amqp.rabbit.core.ChannelAwareMessageListener;
 import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
-import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
@@ -23,18 +21,15 @@ public class Ceb311OrderListenerImpl extends RabbitMqConfig {
     @Autowired
     private Ceb311CustiomsResponse ceb311CustiomsResponse;
 
-    @Autowired
-    private Queue ccnetGainDeclareCspQueue;
-
     /**
      * 队列消息监听
      *
      * @return
      */
     @Bean
-    public SimpleMessageListenerContainer goodsCEB201MessageContainer(ConnectionFactory connectionFactory) {
-        SimpleMessageListenerContainer container = new SimpleMessageListenerContainer(connectionFactory);
-        container.setQueues(ccnetGainDeclareCspQueue);
+    public SimpleMessageListenerContainer goodsCEB201MessageContainer() {
+        SimpleMessageListenerContainer container = new SimpleMessageListenerContainer(connectionFactory());
+        container.setQueues(super.ccnetGainDeclareCspQueue());
         container.setExposeListenerChannel(true);
         container.setMaxConcurrentConsumers(1);
         container.setConcurrentConsumers(1);

src/main/resources/application-dev.yml

@@ -1,7 +1,7 @@
 
 # 服务配置
 server:
-    address: 192.168.1.113
+    address: 0.0.0.0
     port: 8888
     servlet:
         context-path:

src/main/resources/application-global.yml

@@ -1,7 +1,7 @@
 
 # 服务配置
 server:
-    address: 183.62.225.124
+    address: 0.0.0.0
     port: 9580
     servlet:
         context-path:

src/main/resources/application-test.yml

@@ -2,7 +2,7 @@
 
 # 服务配置
 server:
-    address: 192.168.1.68
+    address: 0.0.0.0
     port: 8860
     servlet:
         context-path: /

src/main/resources/application.yml

@@ -8,7 +8,7 @@ app:
 
 # 服务配置
 server:
-    address: 172.18.132.30
+    address: 0.0.0.0
     port: 9580
     servlet:
         context-path: /
@@ -21,7 +21,7 @@ ds:
 # 使用环境
 spring:
     profiles:
-        active: dev
+        active:
 
     aop:
         proxy-target-class: true
@@ -77,7 +77,7 @@ spring:
 
     # 队列配置
     rabbitmq:
-      host: 120.76.26.84
+      host: 39.108.122.249
       port: 5672
       username: admin
       password: Abc-123#
@@ -88,19 +88,19 @@ redis:
     jedis-cluster:
         # Redis Cluster 主机列表
         redis-cluster-host-list:
-            - host: 120.76.84.45
+            - host: 47.112.115.196
               port: 7000
-            - host: 120.76.84.45
+            - host: 47.112.115.196
               port: 7001
-            - host: 120.76.84.45
+            - host: 47.112.115.196
               port: 7002
-            - host: 120.76.26.84
+            - host: 47.112.115.196
               port: 7003
-            - host: 120.76.26.84
+            - host: 47.112.115.196
               port: 7004
-            - host: 120.76.26.84
+            - host: 47.112.115.196
               port: 7005
-#        password: Abc-123#*.-
+        password: Abc-123#*.-
         # 连接超时时间(秒), 默认 2*1000
         connection-timeout: 5000
         # so-timeout:
@@ -174,7 +174,7 @@ cus:
     order:
         # e码头CSP系统
         emato-csp:
-        order-url: http://120.76.26.84:8880/order/add
+        order-url: http://39.108.122.249:8880/order/add
 
     # ws
     waybill:
@@ -208,7 +208,7 @@ cus:
             #海关
             customs: SHENZHEN
             #地址
-            play-url: http://120.76.26.84:9999/wx/custom/wxCbPay
+            play-url: http://39.108.122.249:9999/wx/custom/wxCbPay