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

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'org.springframework.boot' version '2.0.2.RELEASE'
+    id 'org.springframework.boot' version '2.7.2'
 }
 
 apply plugin: 'java'
@@ -41,7 +41,7 @@ repositories {
 
 
 war {
-    baseName = 'atalong-spring-boot-gradle'
+    archiveBaseName = 'ccnet-wx-mp3.0'
     version =  '1.0.0'
 }
 

src/main/java/com/emato/ccnet/wx/config/db/middle/MiddleDataSourceConfiguration.java

@@ -1,5 +1,7 @@
 package com.emato.ccnet.wx.config.db.middle;
 
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.SqlSessionTemplate;
@@ -30,7 +32,7 @@ public class MiddleDataSourceConfiguration {
     @Autowired
     private Environment env;
 
-    @Bean
+    /*@Bean
     @ConfigurationProperties(prefix = "spring.datasource.middle")
     public DataSourceProperties middleDataSourceProperties() {
         return new DataSourceProperties();
@@ -40,10 +42,22 @@ public class MiddleDataSourceConfiguration {
     public DataSource middleDataSource() {
         DataSource dataSource = middleDataSourceProperties().initializeDataSourceBuilder().build();
         return dataSource;
+    }*/
+
+    @Bean
+    @ConfigurationProperties(prefix = "spring.datasource.middle")
+    public HikariConfig middleHikariConfig() {
+        return new HikariConfig();
+    }
+
+    @Bean(destroyMethod = "close")
+    public HikariDataSource middleDataSource() {
+        HikariDataSource dataSource = new HikariDataSource(middleHikariConfig());
+        return dataSource;
     }
 
     @Bean
-    public SqlSessionFactory middleSqlSessionFactory(DataSource middleDataSource) throws Exception  {
+    public SqlSessionFactory middleSqlSessionFactory(HikariDataSource middleDataSource) throws Exception  {
         SqlSessionFactoryBean sessionFactoryBean = new SqlSessionFactoryBean();
         sessionFactoryBean.setDataSource(middleDataSource);
 
@@ -57,7 +71,7 @@ public class MiddleDataSourceConfiguration {
     }
 
     @Bean(name = "middleTransactionManager")
-    public DataSourceTransactionManager middleTransactionManager( DataSource middleDataSource) {
+    public DataSourceTransactionManager middleTransactionManager(HikariDataSource middleDataSource) {
         return new DataSourceTransactionManager(middleDataSource);
     }
 

src/main/java/com/emato/ccnet/wx/config/db/primary/PrimaryDataSourceConfiguration.java

@@ -1,5 +1,7 @@
 package com.emato.ccnet.wx.config.db.primary;
 
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.SqlSessionTemplate;
@@ -30,7 +32,7 @@ public class PrimaryDataSourceConfiguration {
     @Autowired
     private Environment env;
 
-    @Bean
+    /*@Bean
     @ConfigurationProperties(prefix = "spring.datasource.primary")
     public DataSourceProperties primaryDataSourceProperties() {
         return new DataSourceProperties();
@@ -40,12 +42,24 @@ public class PrimaryDataSourceConfiguration {
     public DataSource primaryDataSource() {
         DataSource dataSource = primaryDataSourceProperties().initializeDataSourceBuilder().build();
         return dataSource;
+    }*/
+
+    @Bean
+    @ConfigurationProperties(prefix = "spring.datasource.primary")
+    public HikariConfig masterHikariConfig() {
+        return new HikariConfig();
+    }
+
+    @Bean(destroyMethod = "close")
+    public HikariDataSource masterDataSource() {
+        HikariDataSource dataSource = new HikariDataSource(masterHikariConfig());
+        return dataSource;
     }
 
     @Bean
-    public SqlSessionFactory primarySqlSessionFactory(DataSource primaryDataSource) throws Exception  {
+    public SqlSessionFactory primarySqlSessionFactory(HikariDataSource masterDataSource) throws Exception  {
         SqlSessionFactoryBean sessionFactoryBean = new SqlSessionFactoryBean();
-        sessionFactoryBean.setDataSource(primaryDataSource);
+        sessionFactoryBean.setDataSource(masterDataSource);
 
         //配置mybatis-config.xml
         sessionFactoryBean.setConfigLocation(new PathMatchingResourcePatternResolver().getResource(env.getProperty("mybatis.primary.config-location")));
@@ -57,8 +71,8 @@ public class PrimaryDataSourceConfiguration {
     }
 
     @Bean(name = "primaryTransactionManager")
-    public DataSourceTransactionManager primaryTransactionManager( DataSource primaryDataSource) {
-        return new DataSourceTransactionManager(primaryDataSource);
+    public DataSourceTransactionManager primaryTransactionManager(HikariDataSource masterDataSource) {
+        return new DataSourceTransactionManager(masterDataSource);
     }
 
     @Bean

src/main/java/com/emato/ccnet/wx/config/db/three/ThreeDataSourceConfiguration.java

@@ -1,5 +1,7 @@
 package com.emato.ccnet.wx.config.db.three;
 
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.SqlSessionTemplate;
@@ -30,7 +32,7 @@ public class ThreeDataSourceConfiguration {
     @Autowired
     private Environment env;
 
-    @Bean
+    /*@Bean
     @ConfigurationProperties(prefix = "spring.datasource.three")
     public DataSourceProperties threeDataSourceProperties() {
         return new DataSourceProperties();
@@ -40,10 +42,22 @@ public class ThreeDataSourceConfiguration {
     public DataSource threeDataSource() {
         DataSource dataSource = threeDataSourceProperties().initializeDataSourceBuilder().build();
         return dataSource;
+    }*/
+
+    @Bean
+    @ConfigurationProperties(prefix = "spring.datasource.three")
+    public HikariConfig threeHikariConfig() {
+        return new HikariConfig();
+    }
+
+    @Bean(destroyMethod = "close")
+    public HikariDataSource threeDataSource() {
+        HikariDataSource dataSource = new HikariDataSource(threeHikariConfig());
+        return dataSource;
     }
 
     @Bean
-    public SqlSessionFactory threeSqlSessionFactory(DataSource threeDataSource) throws Exception  {
+    public SqlSessionFactory threeSqlSessionFactory(HikariDataSource threeDataSource) throws Exception  {
         SqlSessionFactoryBean sessionFactoryBean = new SqlSessionFactoryBean();
         sessionFactoryBean.setDataSource(threeDataSource);
 
@@ -57,7 +71,7 @@ public class ThreeDataSourceConfiguration {
     }
 
     @Bean(name = "threeTransactionManager")
-    public DataSourceTransactionManager threeTransactionManager( DataSource threeDataSource) {
+    public DataSourceTransactionManager threeTransactionManager(HikariDataSource threeDataSource) {
         return new DataSourceTransactionManager(threeDataSource);
     }
 

src/main/java/com/emato/ccnet/wx/config/servlet/WebMvcConfiguration.java

@@ -32,10 +32,10 @@ public class WebMvcConfiguration {
         return filterBean;
     }
 
-    @Bean
+    /*@Bean
     public DefaultServletHttpRequestHandler defaultServletHttpRequestHandler() {
         return new DefaultServletHttpRequestHandler();
-    }
+    }*/
 
 
     /**

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

@@ -7,8 +7,10 @@ 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.rabbit.core.ChannelAwareMessageListener;
+import org.springframework.amqp.core.Queue;
+import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 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;
@@ -21,15 +23,18 @@ public class Ceb311OrderListenerImpl extends RabbitMqConfig {
     @Autowired
     private Ceb311CustiomsResponse ceb311CustiomsResponse;
 
+    @Autowired
+    private Queue ccnetGainDeclareCspQueue;
+
     /**
      * 队列消息监听
      *
      * @return
      */
     @Bean
-    public SimpleMessageListenerContainer goodsCEB201MessageContainer() {
-        SimpleMessageListenerContainer container = new SimpleMessageListenerContainer(connectionFactory());
-        container.setQueues(super.ccnetGainDeclareCspQueue());
+    public SimpleMessageListenerContainer goodsCEB201MessageContainer(ConnectionFactory connectionFactory) {
+        SimpleMessageListenerContainer container = new SimpleMessageListenerContainer(connectionFactory);
+        container.setQueues(ccnetGainDeclareCspQueue);
         container.setExposeListenerChannel(true);
         container.setMaxConcurrentConsumers(1);
         container.setConcurrentConsumers(1);

src/main/resources/application-dev.yml

@@ -8,7 +8,9 @@ server:
 
 # 当前环境
 spring:
-    profiles: dev
+    config:
+        activate:
+            on-profile: dev
 
     # 数据源
     datasource:
@@ -16,9 +18,9 @@ spring:
             # 数据源zaxxer HikariCP
             type: com.zaxxer.hikari.HikariDataSource
             driver-class-name: org.mariadb.jdbc.Driver
-            url: jdbc:mysql://127.0.0.1:3306/ccnet_wx?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-            username: root
-            password: 111111
+            jdbc-url: jdbc:mariadb://192.168.1.10:10230/ccnet_wx?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+            username: tuser
+            password: Bxt4F!P7jM
             hikari:
                 read-only: true
                 connection-timeout: 10000
@@ -31,9 +33,9 @@ spring:
             # 数据源zaxxer HikariCP
             type: com.zaxxer.hikari.HikariDataSource
             driver-class-name: org.mariadb.jdbc.Driver
-            url: jdbc:mysql://120.76.84.45:3306/kmall_pt?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+            jdbc-url: jdbc:mariadb://192.168.1.10:10230/kmall_pt?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
             username: tuser
-            password: Qq!123
+            password: Bxt4F!P7jM
             hikari:
                 read-only: true
                 connection-timeout: 10000
@@ -57,17 +59,17 @@ redis:
     jedis-cluster:
         # Redis Cluster 主机列表
         redis-cluster-host-list:
-            - host: 192.168.1.248
+            - host: 127.0.0.1
               port: 7000
-            - host: 192.168.1.248
+            - host: 127.0.0.1
               port: 7001
-            - host: 192.168.1.248
+            - host: 127.0.0.1
               port: 7002
-            - host: 192.168.1.249
+            - host: 127.0.0.1
               port: 7003
-            - host: 192.168.1.249
+            - host: 127.0.0.1
               port: 7004
-            - host: 192.168.1.249
+            - host: 127.0.0.1
               port: 7005
         # 连接超时时间(秒), 默认 2*1000
         connection-timeout: 5000

src/main/resources/application-global.yml

@@ -1,3 +1,5 @@
+## 为开发微信国际版配置文件，未使用了。
+
 
 # 服务配置
 server:
@@ -8,8 +10,9 @@ server:
 
 # 当前环境
 spring:
-    profiles: global
-
+    config:
+        activate:
+            on-profile: global
 
     # 数据源
     datasource:
@@ -17,7 +20,7 @@ spring:
             # 数据源zaxxer HikariCP
             type: com.zaxxer.hikari.HikariDataSource
             driver-class-name: org.mariadb.jdbc.Driver
-            url: jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/ccnet_wx_global?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+            jdbc-url: jdbc:mariadb://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/ccnet_wx_global?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
             username: ccnet_wx
             password: b$bFB*86yy
             hikari:
@@ -32,7 +35,7 @@ spring:
             # 数据源zaxxer HikariCP
             type: com.zaxxer.hikari.HikariDataSource
             driver-class-name: org.mariadb.jdbc.Driver
-            url: jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/kmall_pt_global?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+            jdbc-url: jdbc:mariadb://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/kmall_pt_global?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
             username: kmall_pt
             password: AFnwRBu!3q
             hikari:
@@ -47,7 +50,7 @@ spring:
             # 数据源zaxxer HikariCP
             type: com.zaxxer.hikari.HikariDataSource
             driver-class-name: org.mariadb.jdbc.Driver
-            url: jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/oms_write?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+            jdbc-url: jdbc:mariadb://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/oms_write?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
             username: out_qhm
             password: r%4PEusOn&
             hikari:

src/main/resources/application-test.yml

@@ -9,7 +9,9 @@ server:
 
 # 使用环境
 spring:
-    profiles: test
+    config:
+        activate:
+            on-profile: test
 
     # 数据源
     datasource:
@@ -17,9 +19,9 @@ spring:
             # 数据源zaxxer HikariCP
             type: com.zaxxer.hikari.HikariDataSource
             driver-class-name: org.mariadb.jdbc.Driver
-            url: jdbc:mysql://192.168.1.251:3306/ccnet_wx?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-            username: ceshi
-            password: abc-123
+            jdbc-url: jdbc:mariadb://192.168.1.10:10230/ccnet_wx?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+            username: tuser
+            password: Bxt4F!P7jM
             hikari:
                 read-only: true
                 connection-timeout: 10000
@@ -32,9 +34,9 @@ spring:
             # 数据源zaxxer HikariCP
             type: com.zaxxer.hikari.HikariDataSource
             driver-class-name: org.mariadb.jdbc.Driver
-            url: jdbc:mysql://120.76.84.45:3306/kmall_pt?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+            jdbc-url: jdbc:mariadb://192.168.1.10:10230/kmall_pt?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
             username: tuser
-            password: Qq!123
+            password: Bxt4F!P7jM
             hikari:
                 read-only: true
                 connection-timeout: 10000
@@ -47,9 +49,9 @@ spring:
             # 数据源zaxxer HikariCP
             type: com.zaxxer.hikari.HikariDataSource
             driver-class-name: org.mariadb.jdbc.Driver
-            url: jdbc:mysql://120.76.84.45:3306/oms_write?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+            jdbc-url: jdbc:mariadb://192.168.1.10:10230/oms_write?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
             username: tuser
-            password: Qq!123
+            password: Bxt4F!P7jM
             hikari:
                 read-only: true
                 connection-timeout: 10000
@@ -61,8 +63,8 @@ spring:
 
     # 队列配置
     rabbitmq:
-      host: 120.76.26.84
-      port: 5672
+      host: 192.168.1.12
+      port: 13123
       username: admin
       password: Abc-123#
       virtual-host: /
@@ -72,18 +74,19 @@ redis:
     jedis-cluster:
         # Redis Cluster 主机列表
         redis-cluster-host-list:
-            - host: 192.168.1.248
+            - host: 192.168.1.12
               port: 7000
-            - host: 192.168.1.248
+            - host: 192.168.1.12
               port: 7001
-            - host: 192.168.1.248
+            - host: 192.168.1.12
               port: 7002
-            - host: 192.168.1.249
+            - host: 192.168.1.12
               port: 7003
-            - host: 192.168.1.249
+            - host: 192.168.1.12
               port: 7004
-            - host: 192.168.1.249
+            - host: 192.168.1.12
               port: 7005
+        password: dBB0gV#!
         # 连接超时时间(秒), 默认 2*1000
         connection-timeout: 5000
         # so-timeout:

src/main/resources/application.yml

@@ -21,19 +21,21 @@ ds:
 # 使用环境
 spring:
     profiles:
-        active:
+        active: test
 
     aop:
         proxy-target-class: true
-
+    main:
+        allow-bean-definition-overriding: true
+        allow-circular-references: true
 
     # 数据源
     datasource:
         primary:
             # 数据源zaxxer HikariCP
             type: com.zaxxer.hikari.HikariDataSource
-            driver-class-name: com.mysql.jdbc.Driver
-            url: jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/ccnet_wx?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+            driver-class-name: org.mariadb.jdbc.Driver
+            jdbc-url: jdbc:mariadb://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/ccnet_wx?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
             username: ccnet_wx
             password: b$bFB*86yy
             hikari:
@@ -47,8 +49,8 @@ spring:
         middle:
             # 数据源zaxxer HikariCP
             type: com.zaxxer.hikari.HikariDataSource
-            driver-class-name: com.mysql.jdbc.Driver
-            url: jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/kmall_pt?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+            driver-class-name: org.mariadb.jdbc.Driver
+            jdbc-url: jdbc:mariadb://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/kmall_pt?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
             username: kmall_pt
             password: AFnwRBu!3q
             hikari:
@@ -62,8 +64,8 @@ spring:
         three:
             # 数据源zaxxer HikariCP
             type: com.zaxxer.hikari.HikariDataSource
-            driver-class-name: com.mysql.jdbc.Driver
-            url: jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/oms_write?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+            driver-class-name: org.mariadb.jdbc.Driver
+            jdbc-url: jdbc:mariadb://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/oms_write?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
             username: out_qhm
             password: r%4PEusOn&
             hikari: