release new version

Author: yaomingyang

README.md

@@ -9,49 +9,49 @@
 <dependency>
   <groupId>io.github.mingyang66</groupId>
   <artifactId>oceansky-common</artifactId>
-  <version>4.3.9</version>
+  <version>4.4.0</version>
 </dependency>
 <!--Java通用日志组件SDK-->
 <dependency>
   <groupId>io.github.mingyang66</groupId>
   <artifactId>oceansky-logger</artifactId>
-  <version>4.3.9</version>
+  <version>4.4.0</version>
 </dependency>
 <!--Java图形验证码SDK-->
 <dependency>
   <groupId>io.github.mingyang66</groupId>
   <artifactId>oceansky-captcha</artifactId>
-  <version>4.3.9</version>
+  <version>4.4.0</version>
 </dependency>
 <!--Java简繁体转换、多语言支持SDK-->  
 <dependency>
   <groupId>io.github.mingyang66</groupId>
   <artifactId>oceansky-language</artifactId>
-  <version>4.3.9</version>
+  <version>4.4.0</version>
 </dependency>
 <!--Java实体类脱敏SDK-->  
 <dependency>
   <groupId>io.github.mingyang66</groupId>
   <artifactId>oceansky-sensitive</artifactId>
-  <version>4.3.9</version>
+  <version>4.4.0</version>
 </dependency>  
 <!--Java基于jackson的序列化反序列化SDK-->  
 <dependency>
   <groupId>io.github.mingyang66</groupId>
   <artifactId>oceansky-json</artifactId>
-  <version>4.3.9</version>
+  <version>4.4.0</version>
 </dependency>  
 <!--Java基于JWT获取签名解析签名SDK-->  
 <dependency>
   <groupId>io.github.mingyang66</groupId>
   <artifactId>oceansky-jwt</artifactId>
-  <version>4.3.9</version>
+  <version>4.4.0</version>
 </dependency>  
 <!--Java基于日期转换比较计算SDK-->  
 <dependency>
   <groupId>io.github.mingyang66</groupId>
   <artifactId>oceansky-date</artifactId>
-  <version>4.3.9</version>
+  <version>4.4.0</version>
 </dependency>  
 ```
 
@@ -62,31 +62,31 @@
 <dependency>
     <groupId>io.github.mingyang66</groupId>
     <artifactId>emily-spring-boot-logger</artifactId>
-    <version>4.3.9</version>
+    <version>4.4.0</version>
 </dependency>
 <!-- 基于druid的数据库多数据源切换SDK -->
 <dependency>
     <groupId>io.github.mingyang66</groupId>
     <artifactId>emily-spring-boot-datasource</artifactId>
-    <version>4.3.9</version>
+    <version>4.4.0</version>
 </dependency>
 <!-- 基于springboot的请求AOP拦截、返回值包装、全局异常处理SDK -->
 <dependency>
     <groupId>io.github.mingyang66</groupId>
     <artifactId>emily-spring-boot-starter</artifactId>
-    <version>4.3.9</version>
+    <version>4.4.0</version>
 </dependency>
 <!-- 基于springboot的多集群多配置SDK -->
 <dependency>
     <groupId>io.github.mingyang66</groupId>
     <artifactId>emily-spring-boot-redis</artifactId>
-    <version>4.3.9</version>
+    <version>4.4.0</version>
 </dependency>
 <!-- 基于springboot的RabbitMQ支持多虚拟主机多集群SDK -->
 <dependency>
     <groupId>io.github.mingyang66</groupId>
     <artifactId>emily-spring-boot-rabbitmq</artifactId>
-    <version>4.3.9</version>
+    <version>4.4.0</version>
 </dependency>
 ```
 
@@ -95,7 +95,7 @@
 ##### 1 设置新的版本号
 
 ```
-./mvnw versions:set -DnewVersion=4.3.9
+./mvnw versions:set -DnewVersion=4.4.0
 ```
 
 ##### 2 撤销设置

demo-emily-spring-boot/pom.xml

@@ -5,39 +5,39 @@
     <parent>
         <artifactId>emily-spring-boot-parent</artifactId>
         <groupId>io.github.mingyang66</groupId>
-        <version>4.3.9</version>
+        <version>4.4.0</version>
         <relativePath>../emily-spring-boot-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>demo-emily-spring-boot</artifactId>
-    <version>4.3.9</version>
+    <version>4.4.0</version>
     <name>demo-emily-spring-boot</name>
     <dependencies>
         <dependency>
             <groupId>io.github.mingyang66</groupId>
             <artifactId>oceansky-captcha</artifactId>
-            <version>4.3.9</version>
+            <version>4.4.0</version>
         </dependency>
         <dependency>
             <groupId>io.github.mingyang66</groupId>
             <artifactId>emily-spring-boot-starter</artifactId>
-            <version>4.3.9</version>
+            <version>4.4.0</version>
         </dependency>
         <dependency>
             <groupId>io.github.mingyang66</groupId>
             <artifactId>emily-spring-boot-datasource</artifactId>
-            <version>4.3.9</version>
+            <version>4.4.0</version>
         </dependency>
         <dependency>
             <groupId>io.github.mingyang66</groupId>
             <artifactId>emily-spring-boot-redis</artifactId>
-            <version>4.3.9</version>
+            <version>4.4.0</version>
         </dependency>
         <dependency>
             <groupId>io.github.mingyang66</groupId>
             <artifactId>emily-spring-boot-rabbitmq</artifactId>
-            <version>4.3.9</version>
+            <version>4.4.0</version>
         </dependency>
         <dependency>
             <groupId>com.oracle.database.jdbc</groupId>

demo-emily-spring-boot/src/main/resources/application-logback.properties

@@ -50,7 +50,7 @@ spring.emily.logger.root.console=true
 #基础日志文件路径,默认：""
 spring.emily.logger.root.file-path=base
 #日志级别,即该等级之上才会输出，ERROR > WARN > INFO > DEBUG > TRACE >ALL, 默认：INFO
-spring.emily.logger.root.level=info
+spring.emily.logger.root.level=debug
 #记入文件日志格式-不带颜色
 spring.emily.logger.root.pattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %cn --- [%18.18thread] %-36.36logger{36}:%-4.4line : %msg %n
 #控制台输出格式-带颜色，默认：[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] [%-5level] [%-36.36logger{36}:%-4.4line] : %msg%n

demo-emily-spring-boot/src/main/resources/application-rabbit.properties

@@ -1,25 +1,41 @@
 spring.emily.rabbit.enabled=true
 #默认配置标识
 spring.emily.rabbit.default-config=test
+
+#------------------------------------------------连接工厂配置--------------------------------------------------
 #设置TCP连接超时时间，默认：60000ms
-spring.emily.rabbit.connection-timeout=60000
+spring.emily.rabbit.connection.connection-timeout=60000
 #启用或禁用连接自动恢复，默认：true
-spring.emily.rabbit.automatic-recovery=true
+spring.emily.rabbit.connection.automatic-recovery=true
 #设置连接恢复时间间隔，默认：5000ms
-spring.emily.rabbit.network-recovery-interval=5000
+spring.emily.rabbit.connection.network-recovery-interval=5000
 #启用或禁用拓扑恢复，默认：true【拓扑恢复功能可以帮助消费者重新声明之前定义的队列、交换机和绑定等拓扑结构】
-spring.emily.rabbit.topology-recovery=true
+spring.emily.rabbit.connection.topology-recovery=true
+
+#------------------------------------------------连接配置-----------------------------------------------------
 #虚拟主机
 spring.emily.rabbit.config.test.virtual-host=openaccount
-#spring.rabbitmq.host=localhost
-spring.emily.rabbit.config.test.addresses=127.0.0.1:5672,127.0.0.1:5673,127.0.0.1:5674
-#spring.rabbitmq.port=5672
-spring.emily.rabbit.config.test.username=admin
-spring.emily.rabbit.config.test.password=admin
+#集群地址
+spring.emily.rabbit.config.test.addresses=10.10.181.41:5672,10.10.181.42:5672,10.10.181.43:5672
+#用户名
+spring.emily.rabbit.config.test.username=open-account
+#密码
+spring.emily.rabbit.config.test.password=Emis_Qaz123
 #producer
 spring.emily.rabbit.config.test.publisher-confirm-type=correlated
 spring.emily.rabbit.config.test.publisher-returns=true
 spring.emily.rabbit.config.test.template.mandatory=true
+#---------------------------------------------------------生产端重试--------------------------------------------
+#是否启用发布重试，默认：false
+spring.emily.rabbit.config.test.template.retry.enabled=true
+#发送消息的最大重试次数，默认：2
+spring.emily.rabbit.config.test.template.retry.max-attempts=3
+#第一次和第二次发送消息的时间间隔，默认：1000ms
+spring.emily.rabbit.config.test.template.retry.initialInterval=1000ms
+#应用于与上一次时间间隔的乘数，默认：1.0
+spring.emily.rabbit.config.test.template.retry.multiplier=1.0
+#重试的最大时间间隔，默认：10000ms
+spring.emily.rabbit.config.test.template.retry.max-interval=10s
 #consumer
 ##容器类型simple或direct
 spring.emily.rabbit.config.test.listener.type=simple
@@ -53,12 +69,14 @@ spring.emily.rabbit.config.test.listener.simple.retry.max-attempts=3
 spring.emily.rabbit.config.test.listener.simple.retry.max-interval=10000ms
 ##容器：要应用于上一个重试间隔乘数
 spring.emily.rabbit.config.test.listener.simple.retry.multiplier=1
+
+
 spring.emily.rabbit.config.emily.virtual-host=emily
 #spring.rabbitmq.host=localhost
-spring.emily.rabbit.config.emily.addresses=127.0.0.1:5672,127.0.0.1:5673,127.0.0.1:5674
+spring.emily.rabbit.config.emily.addresses=10.10.181.41:5672,10.10.181.42:5672,10.10.181.43:5672
 #spring.rabbitmq.port=5672
-spring.emily.rabbit.config.emily.username=emily
-spring.emily.rabbit.config.emily.password=emily
+spring.emily.rabbit.config.emily.username=open-account
+spring.emily.rabbit.config.emily.password=Emis_Qaz123
 spring.emily.rabbit.config.emily.listener.type=direct
 ##容器：启动的时候是否自动启动容器，默认:true
 spring.emily.rabbit.config.emily.listener.direct.auto-startup=true
@@ -67,7 +85,7 @@ spring.emily.rabbit.config.emily.listener.direct.acknowledge-mode=manual
 ##容器：设置Qos,即rabbit服务器每次推送给消费者未ack消息的个数
 spring.emily.rabbit.config.emily.listener.direct.prefetch=1
 ##容器：默认情况下，拒绝的传递是否重新排队
-#spring.emily.rabbit.config.emily.listener.direct.default-requeue-rejected=true
+spring.emily.rabbit.config.emily.listener.direct.default-requeue-rejected=true
 ##容器：空闲容器事件的发布频率
 #spring.emily.rabbit.config.emily.listener.direct.idle-event-interval=1ms
 ##容器：如果在运行的过程中一个或多个队列被删除，在容器声明的这些队列在代理（broker）上不可用，是否停止容器

demo-emily-spring-boot/src/main/resources/application-redis.properties

@@ -1,54 +1,85 @@
 # 是否开启Redis多数据源配置，默认：true
 spring.emily.redis.enabled=true
-# Redis监控是否开启，默认：false
-spring.emily.redis.monitor-enabled=false
-# Redis监控固定间隔时间，默认：30s
-spring.emily.redis.monitor-fire-rate=10s
-# 是否开启连接校验，默认：false
-spring.emily.redis.validate-connection=false
-# 是否开启共享本地物理连接，默认：true
-spring.emily.redis.share-native-connection=true
+# Redis默认配置标识，无默认值
+spring.emily.redis.default-config=test
+
+# Redis默认使用的客户端类型，LETTUCE|JEDIS
+spring.emily.redis.client-type=lettuce
+
 # Redis默认使用的客户端类型，LETTUCE|JEDIS
-spring.emily.redis.config.default.client-type=lettuce
+spring.emily.redis.config.test.client-type=lettuce
 # Redis连接工厂使用的数据库索引
-spring.emily.redis.config.default.database=1
+spring.emily.redis.config.test.database=1
 # Redis服务器的登录用户名
-spring.emily.redis.config.default.username=default
+spring.emily.redis.config.test.username=
 # Redis服务器的登录密码
-spring.emily.redis.config.default.password=emily123
-# 读取超时时间
-spring.emily.redis.config.default.timeout=3000
-# 连接超时时间
-spring.emily.redis.config.default.connect-timeout=PT3S
+spring.emily.redis.config.test.password=test12345
+# 设置命令操作超时时间，默认：PT1M
+spring.emily.redis.config.test.timeout=PT3S
+# 建立连接超时时间，默认：10S
+spring.emily.redis.config.test.connect-timeout=PT3S
 # 用于通过sentinel进行身份验证的登录用户名
-spring.emily.redis.config.default.sentinel.username=
+spring.emily.redis.config.test.sentinel.username=
 # 使用sentinel进行身份验证的密码
-spring.emily.redis.config.default.sentinel.password=
+spring.emily.redis.config.test.sentinel.password=
 # 主节点名称（Sentinel哨兵配置中定义的主节点名称）
-spring.emily.redis.config.default.sentinel.master=mymaster
+spring.emily.redis.config.test.sentinel.master=mymaster
 # Redis哨兵节点配置，逗号分隔的  host:port
-spring.emily.redis.config.default.sentinel.nodes=127.0.0.1:26379,127.0.0.1:26380,127.0.0.1:26381
+spring.emily.redis.config.test.sentinel.nodes=10.10.84.156:26380,10.10.84.157:26381,10.10.84.158:26382
+
+# 关闭连接超时时间，默认：100ms
+spring.emily.redis.config.test.lettuce.shutdown-timeout=PT0.1S
+# 是否开启连接校验，默认：false
+spring.emily.redis.config.test.lettuce.validate-connection=false
+# 是否开启共享本地物理连接，默认：true
+spring.emily.redis.config.test.lettuce.share-native-connection=true
+# 是否提前初始化连接，默认：false
+spring.emily.redis.config.test.lettuce.eager-initialization=false
+
 # 是否开启连接池(如果引用commons-pool2默认开启)
-spring.emily.redis.config.default.lettuce.pool.enabled=true
-# 最大连接数，-1表示无限制
-spring.emily.redis.config.default.lettuce.pool.max-active=8
-# 最大空闲连接数，-1表示无限制
-spring.emily.redis.config.default.lettuce.pool.max-idle=8
-# 池中最小连接数
-spring.emily.redis.config.default.lettuce.pool.min-idle=4
-# 最大等待时间（在连接池耗尽之后引发异常之前，连接分配应阻止最大的等待时间）
-spring.emily.redis.config.default.lettuce.pool.max-wait=-1
-# 每隔多少时间空闲线程驱逐器关闭多余的空闲连接，且保持最少空闲连接可用，同时min-idle要大于0
-spring.emily.redis.config.default.lettuce.pool.time-between-eviction-runs=PT0.1S
-spring.emily.redis.config.test.client-type=lettuce
-spring.emily.redis.config.test.database=15
-spring.emily.redis.config.test.password=emily123
-spring.emily.redis.config.test.sentinel.password=emily123
-spring.emily.redis.config.test.sentinel.master=mymaster
-spring.emily.redis.config.test.sentinel.nodes=127.0.0.1:26381,127.0.0.1:26382,127.0.0.1:26383
-spring.emily.redis.config.test.timeout=300
+spring.emily.redis.config.test.lettuce.pool.enabled=false
+# 连接池中允许的最大活动连接数，默认值为8。超过这个数值的连接将被阻塞等待。
 spring.emily.redis.config.test.lettuce.pool.max-active=8
+# 连接池中允许的最大空闲连接数，默认值为8。超过这个数值的空闲连接将被关闭。
 spring.emily.redis.config.test.lettuce.pool.max-idle=8
+# 连接池中保持的最小空闲连接数，默认值为0。当连接池中的连接数低于该值时，连接池会创建新的连接。
 spring.emily.redis.config.test.lettuce.pool.min-idle=0
+# 连接池资源耗尽时，连接尝试分配阻塞时间,超时即抛出异常。使用负值无限期阻塞。
 spring.emily.redis.config.test.lettuce.pool.max-wait=-1
+# 空闲对象逐出器线程运行之间的时间。如果为正，则启动空闲对象驱逐线程，否则不执行空闲对象驱逐。，默认：-1
+spring.emily.redis.config.test.lettuce.pool.time-between-eviction-runs=PT0.1S
+# 对象在池中最小可空闲时间, 默认：30分钟
+spring.emily.redis.config.test.lettuce.pool.min-evictable-idle-duration=PT1M
+
+
+#------------------------------------------------------------------------------------------------------------
+spring.emily.redis.config.test1.client-type=lettuce
+spring.emily.redis.config.test1.database=15
+spring.emily.redis.config.test1.password=test12345
+spring.emily.redis.config.test1.sentinel.password=
+spring.emily.redis.config.test1.sentinel.master=mymaster
+spring.emily.redis.config.test1.sentinel.nodes=10.10.84.156:26380,10.10.84.157:26381,10.10.84.158:26382
+# 设置命令操作超时时间，默认：PT1M
+spring.emily.redis.config.test1.timeout=PT3S
+# 连接超时时间，默认：10S
+spring.emily.redis.config.test1.connect-timeout=PT3S
+
+# 关闭连接超时时间，默认：100ms
+spring.emily.redis.config.test1.lettuce.shutdown-timeout=PT0.1S
+# 是否开启连接校验，默认：false
+spring.emily.redis.config.test1.lettuce.validate-connection=false
+# 是否开启共享本地物理连接，默认：true
+spring.emily.redis.config.test1.lettuce.share-native-connection=true
+# 是否提前初始化连接，默认：false
+spring.emily.redis.config.test1.lettuce.eager-initialization=false
+
+spring.emily.redis.config.test1.lettuce.pool.enabled=false
+spring.emily.redis.config.test1.lettuce.pool.max-active=8
+spring.emily.redis.config.test1.lettuce.pool.max-idle=8
+spring.emily.redis.config.test1.lettuce.pool.min-idle=0
+spring.emily.redis.config.test1.lettuce.pool.max-wait=-1
+# 空闲对象逐出器线程运行之间的时间。如果为正，则启动空闲对象驱逐线程，否则不执行空闲对象驱逐。，默认：-1
+spring.emily.redis.config.test1.lettuce.pool.time-between-eviction-runs=PT0.1S
+# 对象在池中最小可空闲时间, 默认：30分钟
+spring.emily.redis.config.test1.lettuce.pool.min-evictable-idle-duration=PT1M
 

demo-emily-spring-cloud/pom.xml

@@ -5,29 +5,29 @@
     <parent>
         <artifactId>emily-spring-boot-parent</artifactId>
         <groupId>io.github.mingyang66</groupId>
-        <version>4.3.9</version>
+        <version>4.4.0</version>
         <relativePath>../emily-spring-boot-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>4.3.9</version>
+    <version>4.4.0</version>
     <name>demo-emily-spring-cloud</name>
     <artifactId>demo-emily-spring-cloud</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>io.github.mingyang66</groupId>
             <artifactId>emily-spring-boot-starter</artifactId>
-            <version>4.3.9</version>
+            <version>4.4.0</version>
         </dependency>
         <dependency>
             <groupId>io.github.mingyang66</groupId>
             <artifactId>emily-spring-cloud-starter</artifactId>
-            <version>4.3.9</version>
+            <version>4.4.0</version>
         </dependency>
         <dependency>
             <groupId>io.github.mingyang66</groupId>
             <artifactId>emily-spring-boot-datasource</artifactId>
-            <version>4.3.9</version>
+            <version>4.4.0</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-actuator -->
         <dependency>