AOS/aos-core
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: 修复maven刷新错误问题

Browse Source 
修复maven刷新错误问题 现在的问题element-common打包不成功
This commit is contained in:
yangjiyu
2022-11-22 16:20:20 +08:00
parent 1528fb49b9
commit aab0b3ae32
16 changed files with 64 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ability/aos-framework-build/pom.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<artifactId>aos-supreme</artifactId>
<groupId>com.aos</groupId>
<version>${revision}</version>
<version>2023.1.1-SNAPSHOT</version>
<relativePath>../aos-supreme/pom.xml</relativePath>
</parent>
ability/aos-supreme/pom.xml
+13 -1
View File
@@ -74,7 +74,7 @@
<slf4j.version>1.7.30</slf4j.version>
<commons-compress.version>1.19</commons-compress.version>
<hutool.version>5.7.16</hutool.version>
<hutool.version>5.8.10</hutool.version>
<!--endregion-->
</properties>
@@ -145,6 +145,18 @@
</plugins>
</build>
<distributionManagement>
<repository>
<id>nexus</id>
<name>releases</name>
<url>https://maven.wylgyx.top/repository/maven-releases/</url>
</repository>
<snapshotRepository>
<id>nexus</id>
<name>snapshots</name>
<url>https://maven.wylgyx.top/repository/maven-snapshots/</url>
</snapshotRepository>
</distributionManagement>
</project>
ability/bin/checkout.sh
+2 -4
View File
@@ -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 && \
ability/bin/clean.sh
+2 -4
View File
@@ -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 &
ability/bin/clone.sh
-2
View File
@@ -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
ability/bin/compile.sh
+2 -4
View File
@@ -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
ability/bin/deploy.sh
+2 -2
View File
@@ -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
ability/bin/install.sh
+2 -4
View File
@@ -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
ability/bin/pull.sh
+2 -4
View File
@@ -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}
ability/bin/push-tag.sh
+2 -4
View File
@@ -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
ability/bin/push.sh
+4 -10
View File
@@ -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
ability/bin/tag.sh
+2 -4
View File
@@ -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}"
ability/bin/validate.sh
+2 -4
View File
@@ -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
aos-element/aos-element-common/pom.xml
+4 -3
View File
@@ -29,17 +29,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
@@ -49,6 +46,10 @@
<groupId>cn.hutool</groupId>
<artifactId>hutool-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</dependency>
</dependencies>
</project>
aos-element/aos-element-common/src/main/java/com/aos/element/common/thread/AosThreadUtil.java
+22 -3
View File
@@ -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;
/**
* 线程池工具
*
pom.xml
+2 -14
View File
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.aos</groupId>
<artifactId>aos-core</artifactId>
<version>stable</version>
@@ -12,19 +14,6 @@
<module>coffee</module>
</modules>
<distributionManagement>
<repository>
<id>nexus</id>
<name>releases</name>
<url>https://maven.wylgyx.top/repository/maven-releases/</url>
</repository>
<snapshotRepository>
<id>nexus</id>
<name>snapshots</name>
<url>https://maven.wylgyx.top/repository/maven-snapshots/</url>
</snapshotRepository>
</distributionManagement>
<properties>
<maven.install.skip>true</maven.install.skip>
<maven.deploy.skip>true</maven.deploy.skip>
@@ -40,5 +29,4 @@
</properties>
</profile>
</profiles>
</project>