From 80c0bec23662617d0cbf5e3cd4b76ae96299f24c Mon Sep 17 00:00:00 2001 From: zach <936933494@qq.com> Date: Tue, 31 Jan 2023 19:13:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E7=BC=93?= =?UTF-8?q?=E5=AD=98Key=E7=94=9F=E6=88=90=E7=AD=96=E7=95=A5=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=93=E5=AD=98=E6=95=B0=E6=8D=AE=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- easy-cache-core/pom.xml | 2 +- .../easycache/cacheapi/core/aspect/CacheAspect.java | 1 + easy-cache-spring-boot-autoconfigure/pom.xml | 2 +- .../src/test/java/Test.java | 12 ------------ easy-cache-spring-boot-starter/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 easy-cache-spring-boot-autoconfigure/src/test/java/Test.java diff --git a/README.md b/README.md index 863bdc6..2a98332 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ <dependency> <groupId>io.github.izachwei</groupId> <artifactId>easy-cache-spring-boot-starter</artifactId> - <version>1.0.0-RELEASE</version> + <version>1.0.1-RELEASE</version> </dependency> ``` diff --git a/easy-cache-core/pom.xml b/easy-cache-core/pom.xml index 26f8c7c..c2c1d3c 100644 --- a/easy-cache-core/pom.xml +++ b/easy-cache-core/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>easy-cache-spring-boot</artifactId> <groupId>io.github.izachwei</groupId> - <version>1.0.0-RELEASE</version> + <version>1.0.1-RELEASE</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/easy-cache-core/src/main/java/com/easycache/cacheapi/core/aspect/CacheAspect.java b/easy-cache-core/src/main/java/com/easycache/cacheapi/core/aspect/CacheAspect.java index 1c5b223..9618424 100644 --- a/easy-cache-core/src/main/java/com/easycache/cacheapi/core/aspect/CacheAspect.java +++ b/easy-cache-core/src/main/java/com/easycache/cacheapi/core/aspect/CacheAspect.java @@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.ObjectUtils; +import java.util.Arrays; import java.util.List; /** diff --git a/easy-cache-spring-boot-autoconfigure/pom.xml b/easy-cache-spring-boot-autoconfigure/pom.xml index 8e42dad..4ea42b6 100644 --- a/easy-cache-spring-boot-autoconfigure/pom.xml +++ b/easy-cache-spring-boot-autoconfigure/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>easy-cache-spring-boot</artifactId> <groupId>io.github.izachwei</groupId> - <version>1.0.0-RELEASE</version> + <version>1.0.1-RELEASE</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/easy-cache-spring-boot-autoconfigure/src/test/java/Test.java b/easy-cache-spring-boot-autoconfigure/src/test/java/Test.java deleted file mode 100644 index 05495ec..0000000 --- a/easy-cache-spring-boot-autoconfigure/src/test/java/Test.java +++ /dev/null @@ -1,12 +0,0 @@ -import com.easycache.cacheapi.core.annotation.CacheSourceType; -import com.easycache.cacheapi.core.annotation.Cached; - -import java.util.concurrent.TimeUnit; - -public class Test { - - @Cached(expire = 5, timeUnit = TimeUnit.MINUTES, type = CacheSourceType.MEMORY) - public void queryUser(String userId) { - - } -} diff --git a/easy-cache-spring-boot-starter/pom.xml b/easy-cache-spring-boot-starter/pom.xml index 230d2ed..d867533 100644 --- a/easy-cache-spring-boot-starter/pom.xml +++ b/easy-cache-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>easy-cache-spring-boot</artifactId> <groupId>io.github.izachwei</groupId> - <version>1.0.0-RELEASE</version> + <version>1.0.1-RELEASE</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/pom.xml b/pom.xml index 903fddf..00d176f 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <guava.version>24.1-jre</guava.version> <apache.commons.version>3.4</apache.commons.version> <groovy.version>3.0.7</groovy.version> - <project.version>1.0.0-RELEASE</project.version> + <project.version>1.0.1-RELEASE</project.version> </properties> <licenses> From 371f209f74a2c14559b29dc8ddc2744940a68140 Mon Sep 17 00:00:00 2001 From: Zach Wei <37742706+izachwei@users.noreply.github.com> Date: Wed, 10 May 2023 13:48:10 +0800 Subject: [PATCH 2/3] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2a98332..7538790 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,7 @@ public class StudyApplication { import com.easycache.cacheapi.core.annotation.CacheSourceType; import com.easycache.cacheapi.core.annotation.Cached; +@Service public class CachedDemo { @Cached(expire = 5, timeUnit = TimeUnit.MINUTES, type = CacheSourceType.MEMORY) public User queryUser(String userId) { From 5ec3e08e3303c616bda6840fc919e752a2f6793b Mon Sep 17 00:00:00 2001 From: Zach Wei <37742706+izachwei@users.noreply.github.com> Date: Tue, 30 May 2023 09:05:05 +0800 Subject: [PATCH 3/3] Create maven.yml --- .github/workflows/maven.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/maven.yml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 0000000..f7367e0 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,35 @@ +# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven + +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +name: Java CI with Maven + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' + cache: maven + - name: Build with Maven + run: mvn -B package --file pom.xml + + # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive + - name: Update dependency graph + uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6