diff --git a/ability/aos-framework-build/pom.xml b/ability/aos-framework-build/pom.xml index 4a4ea99..8199461 100644 --- a/ability/aos-framework-build/pom.xml +++ b/ability/aos-framework-build/pom.xml @@ -8,7 +8,7 @@ aos-supreme com.aos - ${revision} + 2023.1.1-SNAPSHOT ../aos-supreme/pom.xml diff --git a/ability/aos-supreme/pom.xml b/ability/aos-supreme/pom.xml index efa81f8..dfbe732 100644 --- a/ability/aos-supreme/pom.xml +++ b/ability/aos-supreme/pom.xml @@ -74,7 +74,7 @@ 1.7.30 1.19 - 5.7.16 + 5.8.10 @@ -145,6 +145,18 @@ + + + nexus + releases + https://maven.wylgyx.top/repository/maven-releases/ + + + nexus + snapshots + https://maven.wylgyx.top/repository/maven-snapshots/ + + diff --git a/ability/bin/checkout.sh b/ability/bin/checkout.sh index fee58fd..2d3763e 100644 --- a/ability/bin/checkout.sh +++ b/ability/bin/checkout.sh @@ -2,9 +2,7 @@ source ./path.sh -cd "${CURRENT_PATH}"/../fkh-supreme && git checkout $1 && \ -cd "${CURRENT_PATH}"/../fkh-plugin && git checkout $1 && \ -cd "${CURRENT_PATH}"/../fkh-framework-build && git checkout $1 && \ -cd "${CURRENT_PATH}"/../fkh-starter-processor && git checkout $1 +cd "${CURRENT_PATH}"/../aos-supreme && git checkout $1 && \ +cd "${CURRENT_PATH}"/../aos-framework-build && git checkout $1 && \ diff --git a/ability/bin/clean.sh b/ability/bin/clean.sh index dca09ca..1787ad2 100644 --- a/ability/bin/clean.sh +++ b/ability/bin/clean.sh @@ -2,7 +2,5 @@ source ./path.sh -cd "${CURRENT_PATH}"/../fkh-supreme && ./mvnw clean -Dmaven.test.skip=true & -cd "${CURRENT_PATH}"/../fkh-plugin && ./mvnw clean -Dmaven.test.skip=true & -cd "${CURRENT_PATH}"/../fkh-starter-processor && ./mvnw clean -Dmaven.test.skip=true & -cd "${CURRENT_PATH}"/../fkh-framework-build && ./mvnw clean -Dmaven.test.skip=true & +cd "${CURRENT_PATH}"/../aos-supreme && ./mvnw clean -Dmaven.test.skip=true & +cd "${CURRENT_PATH}"/../aos-framework-build && ./mvnw clean -Dmaven.test.skip=true & diff --git a/ability/bin/clone.sh b/ability/bin/clone.sh index 9defdb7..bd85aa3 100644 --- a/ability/bin/clone.sh +++ b/ability/bin/clone.sh @@ -4,7 +4,5 @@ source ./path.sh cd "${CURRENT_PATH}"/.. && \ git clone git@gitlab.server:v5-framework/fkh-supreme.git fkh-supreme && \ -git clone git@gitlab.server:v5-framework/fkh-starter-processor.git fkh-starter-processor && \ -git clone git@gitlab.server:v5-framework/fkh-plugin.git fkh-plugin && \ git clone git@gitlab.server:v5-framework/fkh-framework-build.git fkh-framework-build diff --git a/ability/bin/compile.sh b/ability/bin/compile.sh index 1ce8380..711e57a 100644 --- a/ability/bin/compile.sh +++ b/ability/bin/compile.sh @@ -2,8 +2,6 @@ source ./path.sh -cd "${CURRENT_PATH}"/../fkh-supreme && ./mvnw clean compile -Dmaven.test.skip=true -cd "${CURRENT_PATH}"/../fkh-plugin && ./mvnw clean compile -Dmaven.test.skip=true -cd "${CURRENT_PATH}"/../fkh-starter-processor && ./mvnw clean compile -Dmaven.test.skip=true -cd "${CURRENT_PATH}"/../fkh-framework-build && ./mvnw clean compile -Dmaven.test.skip=true +cd "${CURRENT_PATH}"/../aos-supreme && ./mvnw clean compile -Dmaven.test.skip=true +cd "${CURRENT_PATH}"/../aos-framework-build && ./mvnw clean compile -Dmaven.test.skip=true diff --git a/ability/bin/deploy.sh b/ability/bin/deploy.sh index cf23a74..f372eba 100644 --- a/ability/bin/deploy.sh +++ b/ability/bin/deploy.sh @@ -2,7 +2,7 @@ source ./path.sh -cd "${CURRENT_PATH}"/../fkh-supreme && ./mvnw -T 2C clean deploy -Dmaven.test.skip=true +cd "${CURRENT_PATH}"/../aos-supreme && ./mvnw -T 2C clean deploy -Dmaven.test.skip=true cd "${CURRENT_PATH}"/../fkh-starter-processor && ./mvnw -T 2C clean deploy -Dmaven.test.skip=true cd "${CURRENT_PATH}"/../fkh-plugin && ./mvnw -T 2C clean deploy -Dmaven.test.skip=true -cd "${CURRENT_PATH}"/../fkh-framework-build && ./mvnw -T 2C clean deploy -Dmaven.test.skip=true +cd "${CURRENT_PATH}"/../aos-framework-build && ./mvnw -T 2C clean deploy -Dmaven.test.skip=true diff --git a/ability/bin/install.sh b/ability/bin/install.sh index 7c7af98..1d3e594 100644 --- a/ability/bin/install.sh +++ b/ability/bin/install.sh @@ -2,7 +2,5 @@ source ./path.sh -cd "${CURRENT_PATH}"/../fkh-supreme && ./mvnw -T 2C clean install -Dmaven.test.skip=true -cd "${CURRENT_PATH}"/../fkh-starter-processor && ./mvnw -T 2C clean install -Dmaven.test.skip=true -cd "${CURRENT_PATH}"/../fkh-plugin && ./mvnw -T 2C clean install -Dmaven.test.skip=true -cd "${CURRENT_PATH}"/../fkh-framework-build && ./mvnw -T 2C clean install -Dmaven.test.skip=true +cd "${CURRENT_PATH}"/../aos-supreme && ./mvnw -T 2C clean install -Dmaven.test.skip=true +cd "${CURRENT_PATH}"/../aos-framework-build && ./mvnw -T 2C clean install -Dmaven.test.skip=true diff --git a/ability/bin/pull.sh b/ability/bin/pull.sh index 589fbff..41bbd1b 100644 --- a/ability/bin/pull.sh +++ b/ability/bin/pull.sh @@ -5,7 +5,5 @@ source ./path.sh ORIGIN="$1" BRANCH="$2" -cd "${CURRENT_PATH}"/../fkh-supreme && git -c credential.helper= -c core.quotepath=false -c log.showSignature=false -c core.commentChar= pull --no-stat -v --progress ${ORIGIN} ${BRANCH} -cd "${CURRENT_PATH}"/../fkh-plugin && git -c credential.helper= -c core.quotepath=false -c log.showSignature=false -c core.commentChar= pull --no-stat -v --progress ${ORIGIN} ${BRANCH} -cd "${CURRENT_PATH}"/../fkh-starter-processor && git -c credential.helper= -c core.quotepath=false -c log.showSignature=false -c core.commentChar= pull --no-stat -v --progress ${ORIGIN} ${BRANCH} -cd "${CURRENT_PATH}"/../fkh-framework-build && git -c credential.helper= -c core.quotepath=false -c log.showSignature=false -c core.commentChar= pull --no-stat -v --progress ${ORIGIN} ${BRANCH} +cd "${CURRENT_PATH}"/../aos-supreme && git -c credential.helper= -c core.quotepath=false -c log.showSignature=false -c core.commentChar= pull --no-stat -v --progress ${ORIGIN} ${BRANCH} +cd "${CURRENT_PATH}"/../aos-framework-build && git -c credential.helper= -c core.quotepath=false -c log.showSignature=false -c core.commentChar= pull --no-stat -v --progress ${ORIGIN} ${BRANCH} diff --git a/ability/bin/push-tag.sh b/ability/bin/push-tag.sh index 664e344..cf64579 100644 --- a/ability/bin/push-tag.sh +++ b/ability/bin/push-tag.sh @@ -2,7 +2,5 @@ source ./path.sh -cd "${CURRENT_PATH}"/../fkh-supreme && git push --tags -cd "${CURRENT_PATH}"/../fkh-starter-processor && git push --tags -cd "${CURRENT_PATH}"/../fkh-plugin && git push --tags -cd "${CURRENT_PATH}"/../fkh-framework-build && git push --tags +cd "${CURRENT_PATH}"/../aos-supreme && git push --tags +cd "${CURRENT_PATH}"/../aos-framework-build && git push --tags diff --git a/ability/bin/push.sh b/ability/bin/push.sh index bc233ff..a658311 100644 --- a/ability/bin/push.sh +++ b/ability/bin/push.sh @@ -5,14 +5,8 @@ source ./path.sh ORIGIN="$1" BRANCH="$2" -cd "${CURRENT_PATH}"/../fkh-supreme && git -c credential.helper= -c core.quotepath=false -c log.showSignature=false -c core.commentChar= pull --no-stat -v --progress ${ORIGIN} ${BRANCH} -cd "${CURRENT_PATH}"/../fkh-supreme && git -c credential.helper= -c core.quotepath=false -c log.showSignature=false push --progress --porcelain ${ORIGIN} refs/heads/${BRANCH}:${BRANCH} --tags +cd "${CURRENT_PATH}"/../aos-supreme && git -c credential.helper= -c core.quotepath=false -c log.showSignature=false -c core.commentChar= pull --no-stat -v --progress ${ORIGIN} ${BRANCH} +cd "${CURRENT_PATH}"/../aos-supreme && git -c credential.helper= -c core.quotepath=false -c log.showSignature=false push --progress --porcelain ${ORIGIN} refs/heads/${BRANCH}:${BRANCH} --tags -cd "${CURRENT_PATH}"/../fkh-plugin && git -c credential.helper= -c core.quotepath=false -c log.showSignature=false -c core.commentChar= pull --no-stat -v --progress ${ORIGIN} ${BRANCH} -cd "${CURRENT_PATH}"/../fkh-plugin && git -c credential.helper= -c core.quotepath=false -c log.showSignature=false push --progress --porcelain ${ORIGIN} refs/heads/${BRANCH}:${BRANCH} --tags - -cd "${CURRENT_PATH}"/../fkh-starter-processor && git -c credential.helper= -c core.quotepath=false -c log.showSignature=false -c core.commentChar= pull --no-stat -v --progress ${ORIGIN} ${BRANCH} -cd "${CURRENT_PATH}"/../fkh-starter-processor && git -c credential.helper= -c core.quotepath=false -c log.showSignature=false push --progress --porcelain ${ORIGIN} refs/heads/${BRANCH}:${BRANCH} --tags - -cd "${CURRENT_PATH}"/../fkh-framework-build && git -c credential.helper= -c core.quotepath=false -c log.showSignature=false -c core.commentChar= pull --no-stat -v --progress ${ORIGIN} ${BRANCH} -cd "${CURRENT_PATH}"/../fkh-framework-build && git -c credential.helper= -c core.quotepath=false -c log.showSignature=false push --progress --porcelain ${ORIGIN} refs/heads/${BRANCH}:${BRANCH} --tags +cd "${CURRENT_PATH}"/../aos-framework-build && git -c credential.helper= -c core.quotepath=false -c log.showSignature=false -c core.commentChar= pull --no-stat -v --progress ${ORIGIN} ${BRANCH} +cd "${CURRENT_PATH}"/../aos-framework-build && git -c credential.helper= -c core.quotepath=false -c log.showSignature=false push --progress --porcelain ${ORIGIN} refs/heads/${BRANCH}:${BRANCH} --tags diff --git a/ability/bin/tag.sh b/ability/bin/tag.sh index 071ac65..c152386 100644 --- a/ability/bin/tag.sh +++ b/ability/bin/tag.sh @@ -4,7 +4,5 @@ source ./path.sh TAG_NAME="$1" -cd "${CURRENT_PATH}"/../fkh-supreme && git tag "${TAG_NAME}" -cd "${CURRENT_PATH}"/../fkh-starter-processor && git tag "${TAG_NAME}" -cd "${CURRENT_PATH}"/../fkh-plugin && git tag "${TAG_NAME}" -cd "${CURRENT_PATH}"/../fkh-framework-build && git tag "${TAG_NAME}" +cd "${CURRENT_PATH}"/../aos-supreme && git tag "${TAG_NAME}" +cd "${CURRENT_PATH}"/../aos-framework-build && git tag "${TAG_NAME}" diff --git a/ability/bin/validate.sh b/ability/bin/validate.sh index 2d8febf..b22b8b8 100644 --- a/ability/bin/validate.sh +++ b/ability/bin/validate.sh @@ -2,7 +2,5 @@ source ./path.sh -cd "${CURRENT_PATH}"/../fkh-supreme && ./mvnw -T 2C clean validate -Dmaven.test.skip=true -cd "${CURRENT_PATH}"/../fkh-plugin && ./mvnw -T 2C clean validate -Dmaven.test.skip=true -cd "${CURRENT_PATH}"/../fkh-starter-processor && ./mvnw -T 2C clean validate -Dmaven.test.skip=true -cd "${CURRENT_PATH}"/../fkh-framework-build && ./mvnw -T 2C clean validate -Dmaven.test.skip=true +cd "${CURRENT_PATH}"/../aos-supreme && ./mvnw -T 2C clean validate -Dmaven.test.skip=true +cd "${CURRENT_PATH}"/../aos-framework-build && ./mvnw -T 2C clean validate -Dmaven.test.skip=true diff --git a/aos-element/aos-element-common/pom.xml b/aos-element/aos-element-common/pom.xml index d6df723..e1df443 100644 --- a/aos-element/aos-element-common/pom.xml +++ b/aos-element/aos-element-common/pom.xml @@ -29,17 +29,14 @@ org.springframework spring-beans - compile org.springframework spring-web - compile org.apache.tomcat.embed tomcat-embed-core - compile com.baomidou @@ -49,6 +46,10 @@ cn.hutool hutool-core + + org.apache.logging.log4j + log4j-to-slf4j + \ No newline at end of file diff --git a/aos-element/aos-element-common/src/main/java/com/aos/element/common/thread/AosThreadUtil.java b/aos-element/aos-element-common/src/main/java/com/aos/element/common/thread/AosThreadUtil.java index 696e107..3d5692c 100644 --- a/aos-element/aos-element-common/src/main/java/com/aos/element/common/thread/AosThreadUtil.java +++ b/aos-element/aos-element-common/src/main/java/com/aos/element/common/thread/AosThreadUtil.java @@ -1,14 +1,33 @@ package com.aos.element.common.thread; -import cn.hutool.core.thread.*; -import cn.hutool.core.util.RuntimeUtil; + import com.alibaba.ttl.TtlCallable; import com.alibaba.ttl.TtlRunnable; import com.alibaba.ttl.threadpool.TtlExecutors; -import java.util.concurrent.*; +import java.util.concurrent.Callable; +import java.util.concurrent.CompletionService; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorCompletionService; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.RejectedExecutionHandler; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; import java.util.function.Supplier; +import cn.hutool.core.thread.BlockPolicy; +import cn.hutool.core.thread.ConcurrencyTester; +import cn.hutool.core.thread.ExecutorBuilder; +import cn.hutool.core.thread.GlobalThreadPool; +import cn.hutool.core.thread.NamedThreadFactory; +import cn.hutool.core.thread.RejectPolicy; +import cn.hutool.core.thread.ThreadFactoryBuilder; +import cn.hutool.core.util.RuntimeUtil; + /** * 线程池工具 * diff --git a/pom.xml b/pom.xml index 2616df0..f850ad7 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,8 @@ + 4.0.0 + com.aos aos-core stable @@ -12,19 +14,6 @@ coffee - - - nexus - releases - https://maven.wylgyx.top/repository/maven-releases/ - - - nexus - snapshots - https://maven.wylgyx.top/repository/maven-snapshots/ - - - true true @@ -40,5 +29,4 @@ -