From ed5970a794dab1da35c46e38e7822ce3dd7ed601 Mon Sep 17 00:00:00 2001
From: byteblogs168 <598092184@qq.com>
Date: Thu, 20 Apr 2023 09:00:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=201.0.0=20=E5=AE=8C=E6=88=90=E9=A1=B9?=
=?UTF-8?q?=E7=9B=AE=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
easy-retry-server/pom.xml | 15 ++++--
.../dispatch/actor/scan/ScanGroupActor.java | 1 +
.../server/support/listener/EndListener.java | 2 +-
.../support/listener/StartListener.java | 2 +-
.../src/main/resources/application.yml | 7 +--
.../src/main/resources/logback-boot.xml | 50 +++++++++++++++++++
6 files changed, 67 insertions(+), 10 deletions(-)
create mode 100644 easy-retry-server/src/main/resources/logback-boot.xml
diff --git a/easy-retry-server/pom.xml b/easy-retry-server/pom.xml
index 6199983d8..d0aad6872 100644
--- a/easy-retry-server/pom.xml
+++ b/easy-retry-server/pom.xml
@@ -33,11 +33,11 @@
akka-actor-typed_2.13
2.8.0
-
- ch.qos.logback
- logback-classic
- 1.4.6
-
+
+
+
+
+
com.typesafe.akka
akka-actor-testkit-typed_2.13
@@ -109,6 +109,11 @@
commons-lang
2.6
+
+
+
+
+
diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/scan/ScanGroupActor.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/scan/ScanGroupActor.java
index 91b9d1e45..334e0c370 100644
--- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/scan/ScanGroupActor.java
+++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/scan/ScanGroupActor.java
@@ -2,6 +2,7 @@ package com.aizuda.easy.retry.server.support.dispatch.actor.scan;
import akka.actor.AbstractActor;
import akka.actor.ActorRef;
+import com.aizuda.easy.retry.server.support.retry.RetryExecutor;
import com.aizuda.easy.retry.server.support.strategy.FilterStrategies;
import com.aizuda.easy.retry.server.support.strategy.StopStrategies;
import com.aizuda.easy.retry.common.core.log.LogUtils;
diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/listener/EndListener.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/listener/EndListener.java
index 2af4c1174..cb3886f0b 100644
--- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/listener/EndListener.java
+++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/listener/EndListener.java
@@ -25,7 +25,7 @@ public class EndListener implements ApplicationListener {
@Override
public void onApplicationEvent(ContextClosedEvent event) {
- LogUtils.info(log, "easy-retry-SERVER 停止");
+ LogUtils.info(log, "EASY-RETRY-SERVER 停止");
lifecycleList.forEach(Lifecycle::close);
}
}
diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/listener/StartListener.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/listener/StartListener.java
index 9a82576a2..27b26a06c 100644
--- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/listener/StartListener.java
+++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/listener/StartListener.java
@@ -25,7 +25,7 @@ public class StartListener implements ApplicationListener
@Override
public void onApplicationEvent(ContextRefreshedEvent event) {
- LogUtils.info(log, "easy-retry-SERVER 启动");
+ LogUtils.info(log, "EASY-RETRY-SERVER 启动");
lifecycleList.forEach(Lifecycle::start);
}
}
diff --git a/easy-retry-server/src/main/resources/application.yml b/easy-retry-server/src/main/resources/application.yml
index a111982f0..6e3a6f59e 100644
--- a/easy-retry-server/src/main/resources/application.yml
+++ b/easy-retry-server/src/main/resources/application.yml
@@ -7,14 +7,14 @@ spring:
username: root
password: root
type: com.zaxxer.hikari.HikariDataSource
- driver-class-name: com.mysql.jdbc.Driver
+ driver-class-name: com.mysql.cj.jdbc.Driver
hikari:
connection-timeout: 30000
minimum-idle: 5
maximum-pool-size: 20
auto-commit: true
idle-timeout: 30000
- pool-name: x_retry
+ pool-name: easy_retry
max-lifetime: 1800000
connection-test-query: SELECT 1
web:
@@ -32,7 +32,8 @@ mybatis-plus:
configuration:
map-underscore-to-camel-case: true
cache-enabled: true
-
+logging:
+ config: classpath:logback-boot.xml
easy-retry:
lastDays: 30 # 拉取重试数据的天数
retryPullPageSize: 100 # 拉取重试数据的每批次的大小
diff --git a/easy-retry-server/src/main/resources/logback-boot.xml b/easy-retry-server/src/main/resources/logback-boot.xml
new file mode 100644
index 000000000..821afc9f8
--- /dev/null
+++ b/easy-retry-server/src/main/resources/logback-boot.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+ %d %p (%file:%line\)- %m%n
+
+ UTF-8
+
+
+
+
+
+
+ log/sys.log
+
+
+
+
+
+ log/sys.%d.%i.log
+
+ 30
+
+
+ 1KB
+
+
+
+
+
+ %d %p (%file:%line\)- %m%n
+
+
+ UTF-8
+
+
+
+
+
+
+
+
+
+
+
+
+