diff --git a/jcommon/aop/pom.xml b/jcommon/aop/pom.xml
index de050eb32..bfa30b9a7 100644
--- a/jcommon/aop/pom.xml
+++ b/jcommon/aop/pom.xml
@@ -8,7 +8,7 @@
1.4-jdk20-SNAPSHOT
aop
- 1.4-jdk20-SNAPSHOT
+ 1.4-jdk21-SNAPSHOT
javax.annotation
diff --git a/jcommon/buddy/pom.xml b/jcommon/buddy/pom.xml
index b10b99dc1..bd3f53258 100644
--- a/jcommon/buddy/pom.xml
+++ b/jcommon/buddy/pom.xml
@@ -33,7 +33,7 @@
org.projectlombok
lombok
- 1.18.28
+ 1.18.30
provided
diff --git a/jcommon/codecheck/pom.xml b/jcommon/codecheck/pom.xml
index 61aa086ac..44fe1a40e 100644
--- a/jcommon/codecheck/pom.xml
+++ b/jcommon/codecheck/pom.xml
@@ -8,7 +8,7 @@
1.4-jdk20-SNAPSHOT
codecheck
- 1.4-jdk20-SNAPSHOT
+ 1.4-jdk21-SNAPSHOT
dom4j
@@ -18,7 +18,7 @@
run.mone
infra-result
- 1.4-jdk20-SNAPSHOT
+ 1.4-jdk21-SNAPSHOT
org.apache.commons
@@ -33,8 +33,8 @@
maven-compiler-plugin
3.11.0
- 20
- 20
+ 21
+ 21
UTF-8
--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
diff --git a/jcommon/codegen/pom.xml b/jcommon/codegen/pom.xml
index f62fe5559..0498007e6 100644
--- a/jcommon/codegen/pom.xml
+++ b/jcommon/codegen/pom.xml
@@ -8,7 +8,7 @@
1.4-jdk20-SNAPSHOT
codegen
- 1.4-jdk20-SNAPSHOT
+ 1.4-jdk21-SNAPSHOT
commons-io
@@ -36,7 +36,7 @@
run.mone
infra-result
- 1.4-jdk20-SNAPSHOT
+ 1.4-jdk21-SNAPSHOT
thrift
diff --git a/jcommon/common/pom.xml b/jcommon/common/pom.xml
index c861f63da..65fe2d6c7 100644
--- a/jcommon/common/pom.xml
+++ b/jcommon/common/pom.xml
@@ -93,7 +93,7 @@
org.projectlombok
lombok
- 1.18.28
+ 1.18.30
provided
diff --git a/jcommon/crypto/pom.xml b/jcommon/crypto/pom.xml
index 0f8b5083f..211fc718b 100644
--- a/jcommon/crypto/pom.xml
+++ b/jcommon/crypto/pom.xml
@@ -12,7 +12,7 @@
org.projectlombok
lombok
- 1.18.28
+ 1.18.30
provided
diff --git a/jcommon/docean-plugin/docean-plugin-api/pom.xml b/jcommon/docean-plugin/docean-plugin-api/pom.xml
index 8e85be8bd..a44285f02 100644
--- a/jcommon/docean-plugin/docean-plugin-api/pom.xml
+++ b/jcommon/docean-plugin/docean-plugin-api/pom.xml
@@ -8,4 +8,5 @@
1.4-jdk20-SNAPSHOT
docean-plugin-api
+ 1.4-jdk21-SNAPSHOT
diff --git a/jcommon/docean-plugin/docean-plugin-config/pom.xml b/jcommon/docean-plugin/docean-plugin-config/pom.xml
index 1e427a5a0..7918ef5cd 100644
--- a/jcommon/docean-plugin/docean-plugin-config/pom.xml
+++ b/jcommon/docean-plugin/docean-plugin-config/pom.xml
@@ -8,4 +8,5 @@
1.4-jdk20-SNAPSHOT
docean-plugin-config
+ 1.4-jdk21-SNAPSHOT
diff --git a/jcommon/docean-plugin/docean-plugin-datasource/pom.xml b/jcommon/docean-plugin/docean-plugin-datasource/pom.xml
index 1cf7c14a2..64978c4b8 100644
--- a/jcommon/docean-plugin/docean-plugin-datasource/pom.xml
+++ b/jcommon/docean-plugin/docean-plugin-datasource/pom.xml
@@ -8,6 +8,7 @@
1.4-jdk20-SNAPSHOT
docean-plugin-datasource
+ 1.4-jdk21-SNAPSHOT
run.mone
diff --git a/jcommon/docean-plugin/docean-plugin-db/pom.xml b/jcommon/docean-plugin/docean-plugin-db/pom.xml
index 7d20afb33..c7819ed20 100644
--- a/jcommon/docean-plugin/docean-plugin-db/pom.xml
+++ b/jcommon/docean-plugin/docean-plugin-db/pom.xml
@@ -8,6 +8,7 @@
1.4-jdk20-SNAPSHOT
docean-plugin-db
+ 1.4-jdk21-SNAPSHOT
run.mone
@@ -17,7 +18,7 @@
run.mone
docean-plugin-datasource
- 1.4-jdk20-SNAPSHOT
+ 1.4-jdk21-SNAPSHOT
run.mone
diff --git a/jcommon/docean-plugin/docean-plugin-sql/pom.xml b/jcommon/docean-plugin/docean-plugin-sql/pom.xml
index dc7244d44..0f53b34ca 100644
--- a/jcommon/docean-plugin/docean-plugin-sql/pom.xml
+++ b/jcommon/docean-plugin/docean-plugin-sql/pom.xml
@@ -8,21 +8,22 @@
1.4-jdk20-SNAPSHOT
docean-plugin-sql
+ 1.4-jdk21-SNAPSHOT
run.mone
docean-plugin-api
- 1.4-jdk20-SNAPSHOT
+ 1.4-jdk21-SNAPSHOT
run.mone
docean-plugin-datasource
- 1.4-jdk20-SNAPSHOT
+ 1.4-jdk21-SNAPSHOT
run.mone
docean-plugin-config
- 1.4-jdk20-SNAPSHOT
+ 1.4-jdk21-SNAPSHOT
diff --git a/jcommon/docean-plugin/docean-plugin-test/pom.xml b/jcommon/docean-plugin/docean-plugin-test/pom.xml
index 8a9a6e63a..acff05178 100644
--- a/jcommon/docean-plugin/docean-plugin-test/pom.xml
+++ b/jcommon/docean-plugin/docean-plugin-test/pom.xml
@@ -32,7 +32,7 @@
run.mone
docean-plugin-db
- 1.4-jdk20-SNAPSHOT
+ 1.4-jdk21-SNAPSHOT
run.mone
diff --git a/jcommon/docean-spring-starter/pom.xml b/jcommon/docean-spring-starter/pom.xml
index dcc4f1173..f16f479bc 100644
--- a/jcommon/docean-spring-starter/pom.xml
+++ b/jcommon/docean-spring-starter/pom.xml
@@ -8,6 +8,7 @@
jcommon
1.4-jdk20-SNAPSHOT
+ 1.4-jdk21-SNAPSHOT
docean-spring-starter
@@ -31,7 +32,7 @@
run.mone
docean
- 1.4-java20-SNAPSHOT
+ 1.4-jdk21-SNAPSHOT
provided
@@ -47,12 +48,11 @@
3.11.0
- --add-modules=jdk.incubator.concurrent
--enable-preview
- 20
- 20
- 20
+ 21
+ 21
+ 21
diff --git a/jcommon/docean/pom.xml b/jcommon/docean/pom.xml
index 86378317b..464159cfb 100644
--- a/jcommon/docean/pom.xml
+++ b/jcommon/docean/pom.xml
@@ -8,7 +8,7 @@
1.4-jdk20-SNAPSHOT
docean
- 1.4-jdk20-SNAPSHOT
+ 1.4-jdk21-SNAPSHOT
4.1.97.Final
@@ -16,7 +16,7 @@
run.mone
easy
- 1.4-jdk20-SNAPSHOT
+ 1.4-jdk21-SNAPSHOT
cglib
@@ -58,12 +58,11 @@
3.11.0
- --add-modules=jdk.incubator.concurrent
--enable-preview
- 20
- 20
- 20
+ 21
+ 21
+ 21
diff --git a/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/mvc/Get.java b/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/mvc/Get.java
index 2f5e929ae..4330d22a9 100644
--- a/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/mvc/Get.java
+++ b/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/mvc/Get.java
@@ -17,9 +17,7 @@
package com.xiaomi.youpin.docean.mvc;
import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
import com.xiaomi.youpin.docean.anno.RequestParam;
-import com.xiaomi.youpin.docean.exception.DoceanException;
import com.xiaomi.youpin.docean.mvc.httpmethod.HttpMethodUtils;
import io.netty.handler.codec.http.QueryStringDecoder;
@@ -47,9 +45,11 @@ public static JsonArray getParams(HttpRequestMethod method, String uri) {
RequestParam param = getRequestParam(it);
String name = param.value();
if (!params.containsKey(name)) {
- throw new DoceanException("Missing parameter:" + name);
+ array.add("");
+// throw new DoceanException("Missing parameter:" + name);
+ } else {
+ array.add(params.get(name));
}
- array.add(params.get(name));
}
});
return array;
diff --git a/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/mvc/MvcRunnable.java b/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/mvc/MvcRunnable.java
index c250a6493..b34b2b5d0 100644
--- a/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/mvc/MvcRunnable.java
+++ b/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/mvc/MvcRunnable.java
@@ -14,7 +14,6 @@
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
-import jdk.incubator.concurrent.ScopedValue;
import lombok.extern.slf4j.Slf4j;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/mvc/common/MvcConst.java b/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/mvc/common/MvcConst.java
index 2e81ca2c4..0d01c175d 100644
--- a/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/mvc/common/MvcConst.java
+++ b/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/mvc/common/MvcConst.java
@@ -1,7 +1,6 @@
package com.xiaomi.youpin.docean.mvc.common;
import com.xiaomi.youpin.docean.mvc.MvcContext;
-import jdk.incubator.concurrent.ScopedValue;
/**
* @author goodjava@qq.com
diff --git a/jcommon/docean/src/test/java/com/xiaomi/youpin/docean/test/ScopedTest.java b/jcommon/docean/src/test/java/com/xiaomi/youpin/docean/test/ScopedTest.java
index cb82d7194..4d69b6904 100644
--- a/jcommon/docean/src/test/java/com/xiaomi/youpin/docean/test/ScopedTest.java
+++ b/jcommon/docean/src/test/java/com/xiaomi/youpin/docean/test/ScopedTest.java
@@ -1,9 +1,7 @@
package com.xiaomi.youpin.docean.test;
import com.xiaomi.youpin.docean.test.bo.M;
-import jdk.incubator.concurrent.ScopedValue;
import lombok.SneakyThrows;
-import org.checkerframework.checker.units.qual.C;
import org.junit.Test;
import java.util.concurrent.CountDownLatch;
@@ -30,23 +28,21 @@ public void test1() {
ScopedValue sv = ScopedValue.newInstance();
- IntStream.range(0, num).parallel().forEach(it -> {
- pool.submit(() -> {
- M m = new M();
- m.setId(it);
- ScopedValue.where(sv, m).run(() -> {
- try {
- TimeUnit.SECONDS.sleep(1);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
- i.incrementAndGet();
- System.out.println(sv.get().getId());
- latch.countDown();
- });
-
+ IntStream.range(0, num).parallel().forEach(it -> pool.submit(() -> {
+ M m = new M();
+ m.setId(it);
+ ScopedValue.where(sv, m).run(() -> {
+ try {
+ TimeUnit.SECONDS.sleep(1);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ i.incrementAndGet();
+ System.out.println(sv.get().getId());
+ latch.countDown();
});
- });
+
+ }));
latch.await();
;
System.out.println(i);
diff --git a/jcommon/easy/pom.xml b/jcommon/easy/pom.xml
index 96afb7742..c192bbfac 100644
--- a/jcommon/easy/pom.xml
+++ b/jcommon/easy/pom.xml
@@ -8,6 +8,7 @@
1.4-jdk20-SNAPSHOT
easy
+ 1.4-jdk21-SNAPSHOT
cglib
diff --git a/jcommon/file/src/main/java/com/xiaomi/mone/file/LogFile.java b/jcommon/file/src/main/java/com/xiaomi/mone/file/LogFile.java
index 05e8fe902..5f8b82b61 100644
--- a/jcommon/file/src/main/java/com/xiaomi/mone/file/LogFile.java
+++ b/jcommon/file/src/main/java/com/xiaomi/mone/file/LogFile.java
@@ -17,10 +17,10 @@
* @author goodjava@qq.com
*/
@Slf4j
-public class LogFile implements ILogFile{
+public class LogFile implements ILogFile {
@Getter
- private String file;
+ private String file;
private MoneRandomAccessFile raf;
@@ -38,13 +38,15 @@ public class LogFile implements ILogFile{
@Getter
private int beforePointerHashCode;
- private long pointer;
+ @Getter
+ private volatile long pointer;
//行号
private long lineNumber;
//每次读取时文件的最大偏移量
- private long maxPointer;
+ @Getter
+ private volatile long maxPointer;
private String md5;
@@ -71,14 +73,14 @@ public LogFile(String file, ReadListener listener, long pointer, long lineNumber
private void open() {
try {
- //日志文件进行切分时，减少FileNotFoundException概率
- TimeUnit.SECONDS.sleep(5);
+ //日志文件进行切分时，减少FileNotFoundException概率,这个应该删掉了,在使用前保证就好了，由于历史原因,降低了休眠时间
+// TimeUnit.SECONDS.sleep(1);
//4kb
this.raf = new MoneRandomAccessFile(file, "r", 1024 * 4);
reOpen = false;
reFresh = false;
- } catch (InterruptedException e) {
- log.error("open file InterruptedException", e);
+// } catch (InterruptedException e) {
+// log.error("open file InterruptedException", e);
} catch (FileNotFoundException e) {
log.error("open file FileNotFoundException", e);
} catch (IOException e) {
@@ -238,7 +240,7 @@ public String md5(String msg) {
md.update(msg.getBytes());
byte[] digest = md.digest();
StringBuilder sb = new StringBuilder(2 * digest.length);
- for(byte b : digest) {
+ for (byte b : digest) {
sb.append(String.format("%02x", b & 0xff));
}
return sb.toString().toUpperCase();
diff --git a/jcommon/graalvm/pom.xml b/jcommon/graalvm/pom.xml
index 63f76ede7..4ae3a8015 100644
--- a/jcommon/graalvm/pom.xml
+++ b/jcommon/graalvm/pom.xml
@@ -27,7 +27,7 @@
org.projectlombok
lombok
- 1.18.28
+ 1.18.30
provided
diff --git a/jcommon/health/pom.xml b/jcommon/health/pom.xml
index 56aa6531d..f65eea2dc 100644
--- a/jcommon/health/pom.xml
+++ b/jcommon/health/pom.xml
@@ -8,6 +8,7 @@
1.4-jdk20-SNAPSHOT
health
+ 1.4-jdk21-SNAPSHOT
run.mone
@@ -34,7 +35,7 @@
run.mone
aop
- 1.4-jdk20-SNAPSHOT
+ 1.4-jdk21-SNAPSHOT
diff --git a/jcommon/hera/hera-trace/pom.xml b/jcommon/hera/hera-trace/pom.xml
index 0cf983252..b5fb4e6eb 100644
--- a/jcommon/hera/hera-trace/pom.xml
+++ b/jcommon/hera/hera-trace/pom.xml
@@ -8,4 +8,5 @@
1.4-jdk20-SNAPSHOT
hera-trace
+ 1.4-jdk21-SNAPSHOT
diff --git a/jcommon/infra-result/pom.xml b/jcommon/infra-result/pom.xml
index 98b418cc5..4c1086b1d 100644
--- a/jcommon/infra-result/pom.xml
+++ b/jcommon/infra-result/pom.xml
@@ -8,11 +8,12 @@
1.4-jdk20-SNAPSHOT
infra-result
+ 1.4-jdk21-SNAPSHOT
org.projectlombok
lombok
- 1.18.28
+ 1.18.30
provided
diff --git a/jcommon/mistarter/pom.xml b/jcommon/mistarter/pom.xml
index f0388b14a..e77db26a0 100644
--- a/jcommon/mistarter/pom.xml
+++ b/jcommon/mistarter/pom.xml
@@ -8,12 +8,12 @@
1.4-jdk20-SNAPSHOT
mistarter
- 1.6-jdk20-SNAPSHOT
+ 1.6-jdk21-SNAPSHOT
run.mone
aop
- 1.4-jdk20-SNAPSHOT
+ 1.4-jdk21-SNAPSHOT
org.springframework.boot
@@ -24,7 +24,7 @@
run.mone
health
- 1.4-jdk20-SNAPSHOT
+ 1.4-jdk21-SNAPSHOT
run.mone
diff --git a/jcommon/mquic/pom.xml b/jcommon/mquic/pom.xml
index 9cdf9c14a..eb63fce7b 100644
--- a/jcommon/mquic/pom.xml
+++ b/jcommon/mquic/pom.xml
@@ -18,18 +18,13 @@
org.projectlombok
lombok
- 1.18.28
+ 1.18.30
provided
ch.qos.logback
logback-classic
- 1.1.2
-
-
- ch.qos.logback
- logback-core
- 1.1.2
+ 1.2.3
diff --git a/jcommon/prometheus/prometheus-sql/pom.xml b/jcommon/prometheus/prometheus-sql/pom.xml
index 56ea053bf..b7192d819 100644
--- a/jcommon/prometheus/prometheus-sql/pom.xml
+++ b/jcommon/prometheus/prometheus-sql/pom.xml
@@ -24,7 +24,7 @@
org.projectlombok
lombok
- 1.18.28
+ 1.18.30
compile
diff --git a/jcommon/raft/pom.xml b/jcommon/raft/pom.xml
index 34b6fbf85..ef472c95f 100644
--- a/jcommon/raft/pom.xml
+++ b/jcommon/raft/pom.xml
@@ -46,7 +46,7 @@
org.projectlombok
lombok
- 1.18.28
+ 1.18.30
provided
diff --git a/jcommon/rcurve/pom.xml b/jcommon/rcurve/pom.xml
index 4314e3595..9709316f9 100644
--- a/jcommon/rcurve/pom.xml
+++ b/jcommon/rcurve/pom.xml
@@ -8,12 +8,12 @@
1.4-jdk20-SNAPSHOT
rcurve
- 1.4.2-jdk20-jdk20-SNAPSHOT
+ 1.4-jdk21-SNAPSHOT
run.mone
hera-trace
- 1.4-jdk20-SNAPSHOT
+ 1.4-jdk21-SNAPSHOT
io.protostuff
@@ -39,7 +39,7 @@
run.mone
easy
- 1.4-jdk20-SNAPSHOT
+ 1.4-jdk21-SNAPSHOT
io.netty
@@ -49,13 +49,7 @@
ch.qos.logback
logback-classic
- 1.1.2
- provided
-
-
- ch.qos.logback
- logback-core
- 1.1.2
+ 1.2.3
provided
@@ -69,9 +63,9 @@
--enable-preview
- 20
- 20
- 20
+ 21
+ 21
+ 21
diff --git a/jcommon/rpc/pom.xml b/jcommon/rpc/pom.xml
index 996a4fcef..1762b485c 100644
--- a/jcommon/rpc/pom.xml
+++ b/jcommon/rpc/pom.xml
@@ -34,7 +34,7 @@
org.projectlombok
lombok
- 1.18.28
+ 1.18.30
provided
diff --git a/jcommon/sre/pom.xml b/jcommon/sre/pom.xml
index 52c577353..007a8f96a 100644
--- a/jcommon/sre/pom.xml
+++ b/jcommon/sre/pom.xml
@@ -17,7 +17,7 @@
org.projectlombok
lombok
- 1.18.28
+ 1.18.30
provided