From dead60fd49c0ccf36bab8c89dab8de765703e3c3 Mon Sep 17 00:00:00 2001 From: "novice.li" Date: Wed, 13 Mar 2024 22:15:10 +0800 Subject: [PATCH] update package name --- .github/workflows/release.yml | 8 +++----- jetbra-agent/pom.xml | 2 +- .../novice/li => com/novitechie/jetbra}/AgentMain.java | 2 +- .../novice/li => com/novitechie/jetbra}/ConfigHelper.java | 2 +- .../li => com/novitechie/jetbra}/HttpClientAdvice.java | 6 ++---- .../novitechie/jetbra}/PKIXBuilderParametersAdvice.java | 4 ++-- .../li => com/novitechie/jetbra}/VMOptionsAdvice.java | 2 +- .../novitechie/jetbra}/JetbraServerApplication.java | 2 +- .../novitechie/jetbra}/controller/LicenseController.java | 4 ++-- .../li => com/novitechie/jetbra}/model/License.java | 2 +- .../li => com/novitechie/jetbra}/model/Product.java | 2 +- 11 files changed, 16 insertions(+), 20 deletions(-) rename jetbra-agent/src/main/java/{win/novice/li => com/novitechie/jetbra}/AgentMain.java (98%) rename jetbra-agent/src/main/java/{win/novice/li => com/novitechie/jetbra}/ConfigHelper.java (99%) rename jetbra-agent/src/main/java/{win/novice/li => com/novitechie/jetbra}/HttpClientAdvice.java (77%) rename jetbra-agent/src/main/java/{win/novice/li => com/novitechie/jetbra}/PKIXBuilderParametersAdvice.java (82%) rename jetbra-agent/src/main/java/{win/novice/li => com/novitechie/jetbra}/VMOptionsAdvice.java (93%) rename jetbra-server/src/main/java/{win/novice/li => com/novitechie/jetbra}/JetbraServerApplication.java (90%) rename jetbra-server/src/main/java/{win/novice/li => com/novitechie/jetbra}/controller/LicenseController.java (97%) rename jetbra-server/src/main/java/{win/novice/li => com/novitechie/jetbra}/model/License.java (96%) rename jetbra-server/src/main/java/{win/novice/li => com/novitechie/jetbra}/model/Product.java (90%) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 50ea802..b7ef522 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,9 +1,7 @@ name: Maven Build and Release on: - push: - branches: - - main + workflow_dispatch: jobs: release: @@ -41,7 +39,7 @@ jobs: - name: Set up Git run: | git config user.email "novice88@users.noreply.github.com" - git config user.name "novice88" + git config user.name "novitechie" - name: Create Tag run: git tag -a v${{ github.run_number }} -m "Release version v${{ github.run_number }}" @@ -54,4 +52,4 @@ jobs: uses: ncipollo/release-action@v1 with: artifacts: "jetbra-dist/target/jetbra-all.zip" - tag: v${{ github.run_number }} \ No newline at end of file + tag: Jetbra \ No newline at end of file diff --git a/jetbra-agent/pom.xml b/jetbra-agent/pom.xml index 40d8ccd..efebb3e 100644 --- a/jetbra-agent/pom.xml +++ b/jetbra-agent/pom.xml @@ -49,7 +49,7 @@ - win.novice.li.AgentMain + com.novitechie.jetbra.AgentMain true true diff --git a/jetbra-agent/src/main/java/win/novice/li/AgentMain.java b/jetbra-agent/src/main/java/com/novitechie/jetbra/AgentMain.java similarity index 98% rename from jetbra-agent/src/main/java/win/novice/li/AgentMain.java rename to jetbra-agent/src/main/java/com/novitechie/jetbra/AgentMain.java index a6e112c..0157d5d 100644 --- a/jetbra-agent/src/main/java/win/novice/li/AgentMain.java +++ b/jetbra-agent/src/main/java/com/novitechie/jetbra/AgentMain.java @@ -1,4 +1,4 @@ -package win.novice.li; +package com.novitechie.jetbra; import net.bytebuddy.agent.builder.AgentBuilder; import net.bytebuddy.asm.Advice; diff --git a/jetbra-agent/src/main/java/win/novice/li/ConfigHelper.java b/jetbra-agent/src/main/java/com/novitechie/jetbra/ConfigHelper.java similarity index 99% rename from jetbra-agent/src/main/java/win/novice/li/ConfigHelper.java rename to jetbra-agent/src/main/java/com/novitechie/jetbra/ConfigHelper.java index e55b021..156da49 100644 --- a/jetbra-agent/src/main/java/win/novice/li/ConfigHelper.java +++ b/jetbra-agent/src/main/java/com/novitechie/jetbra/ConfigHelper.java @@ -1,4 +1,4 @@ -package win.novice.li; +package com.novitechie.jetbra; import java.io.File; import java.net.URI; diff --git a/jetbra-agent/src/main/java/win/novice/li/HttpClientAdvice.java b/jetbra-agent/src/main/java/com/novitechie/jetbra/HttpClientAdvice.java similarity index 77% rename from jetbra-agent/src/main/java/win/novice/li/HttpClientAdvice.java rename to jetbra-agent/src/main/java/com/novitechie/jetbra/HttpClientAdvice.java index 4e721b5..02e64da 100644 --- a/jetbra-agent/src/main/java/win/novice/li/HttpClientAdvice.java +++ b/jetbra-agent/src/main/java/com/novitechie/jetbra/HttpClientAdvice.java @@ -1,9 +1,7 @@ -package win.novice.li; +package com.novitechie.jetbra; import net.bytebuddy.asm.Advice; -import sun.net.www.http.HttpClient; -import java.lang.reflect.Field; import java.lang.reflect.Method; import java.net.SocketTimeoutException; import java.util.Set; @@ -13,7 +11,7 @@ public class HttpClientAdvice { @Advice.OnMethodExit @SuppressWarnings("unchecked") public static void intercept(@Advice.This Object httpClient) throws Exception { - Class clazz = Class.forName("win.novice.li.ConfigHelper", true, ClassLoader.getSystemClassLoader()); + Class clazz = Class.forName("com.novitechie.jetbra.ConfigHelper", true, ClassLoader.getSystemClassLoader()); Method method = clazz.getDeclaredMethod("loadBlockUrlKeywords"); Set BLOCK_URL_KEYWORDS = (Set) method.invoke(null); String clientString = httpClient.toString(); diff --git a/jetbra-agent/src/main/java/win/novice/li/PKIXBuilderParametersAdvice.java b/jetbra-agent/src/main/java/com/novitechie/jetbra/PKIXBuilderParametersAdvice.java similarity index 82% rename from jetbra-agent/src/main/java/win/novice/li/PKIXBuilderParametersAdvice.java rename to jetbra-agent/src/main/java/com/novitechie/jetbra/PKIXBuilderParametersAdvice.java index e3c3d0e..c8a350c 100644 --- a/jetbra-agent/src/main/java/win/novice/li/PKIXBuilderParametersAdvice.java +++ b/jetbra-agent/src/main/java/com/novitechie/jetbra/PKIXBuilderParametersAdvice.java @@ -1,4 +1,4 @@ -package win.novice.li; +package com.novitechie.jetbra; import net.bytebuddy.asm.Advice; @@ -13,7 +13,7 @@ public class PKIXBuilderParametersAdvice { @Advice.OnMethodEnter @SuppressWarnings("unchecked") public static void intercept(@Advice.Argument(value = 0, readOnly = false) Set trustAnchors) throws Exception { - Class clazz = Class.forName("win.novice.li.ConfigHelper", true, ClassLoader.getSystemClassLoader()); + Class clazz = Class.forName("com.novitechie.jetbra.ConfigHelper", true, ClassLoader.getSystemClassLoader()); Method method = clazz.getDeclaredMethod("loadTrustAnchors"); Set loadedTrustAnchors = (Set)method.invoke(null); HashSet newTrustAnchors = new HashSet<>(trustAnchors); diff --git a/jetbra-agent/src/main/java/win/novice/li/VMOptionsAdvice.java b/jetbra-agent/src/main/java/com/novitechie/jetbra/VMOptionsAdvice.java similarity index 93% rename from jetbra-agent/src/main/java/win/novice/li/VMOptionsAdvice.java rename to jetbra-agent/src/main/java/com/novitechie/jetbra/VMOptionsAdvice.java index a72fb60..eacd5d7 100644 --- a/jetbra-agent/src/main/java/win/novice/li/VMOptionsAdvice.java +++ b/jetbra-agent/src/main/java/com/novitechie/jetbra/VMOptionsAdvice.java @@ -1,4 +1,4 @@ -package win.novice.li; +package com.novitechie.jetbra; import net.bytebuddy.asm.Advice; diff --git a/jetbra-server/src/main/java/win/novice/li/JetbraServerApplication.java b/jetbra-server/src/main/java/com/novitechie/jetbra/JetbraServerApplication.java similarity index 90% rename from jetbra-server/src/main/java/win/novice/li/JetbraServerApplication.java rename to jetbra-server/src/main/java/com/novitechie/jetbra/JetbraServerApplication.java index 8296813..908f0f4 100644 --- a/jetbra-server/src/main/java/win/novice/li/JetbraServerApplication.java +++ b/jetbra-server/src/main/java/com/novitechie/jetbra/JetbraServerApplication.java @@ -1,4 +1,4 @@ -package win.novice.li; +package com.novitechie.jetbra; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/jetbra-server/src/main/java/win/novice/li/controller/LicenseController.java b/jetbra-server/src/main/java/com/novitechie/jetbra/controller/LicenseController.java similarity index 97% rename from jetbra-server/src/main/java/win/novice/li/controller/LicenseController.java rename to jetbra-server/src/main/java/com/novitechie/jetbra/controller/LicenseController.java index bc23522..b0acde8 100644 --- a/jetbra-server/src/main/java/win/novice/li/controller/LicenseController.java +++ b/jetbra-server/src/main/java/com/novitechie/jetbra/controller/LicenseController.java @@ -1,4 +1,4 @@ -package win.novice.li.controller; +package com.novitechie.jetbra.controller; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.SneakyThrows; @@ -11,7 +11,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import win.novice.li.model.License; +import com.novitechie.jetbra.model.License; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; diff --git a/jetbra-server/src/main/java/win/novice/li/model/License.java b/jetbra-server/src/main/java/com/novitechie/jetbra/model/License.java similarity index 96% rename from jetbra-server/src/main/java/win/novice/li/model/License.java rename to jetbra-server/src/main/java/com/novitechie/jetbra/model/License.java index ab542db..13dfa78 100644 --- a/jetbra-server/src/main/java/win/novice/li/model/License.java +++ b/jetbra-server/src/main/java/com/novitechie/jetbra/model/License.java @@ -1,4 +1,4 @@ -package win.novice.li.model; +package com.novitechie.jetbra.model; import lombok.Data; diff --git a/jetbra-server/src/main/java/win/novice/li/model/Product.java b/jetbra-server/src/main/java/com/novitechie/jetbra/model/Product.java similarity index 90% rename from jetbra-server/src/main/java/win/novice/li/model/Product.java rename to jetbra-server/src/main/java/com/novitechie/jetbra/model/Product.java index 834cb3e..c0ecbca 100644 --- a/jetbra-server/src/main/java/win/novice/li/model/Product.java +++ b/jetbra-server/src/main/java/com/novitechie/jetbra/model/Product.java @@ -1,5 +1,5 @@ -package win.novice.li.model; +package com.novitechie.jetbra.model; import lombok.Data;