✨ 依赖兼容处理

lets-mica · Dec 23, 2024 · c6031b0 · c6031b0
1 parent 84e1ed8
commit c6031b0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/.idea/icon.png b/.idea/icon.png
diff --git a/mica-logging/pom.xml b/mica-logging/pom.xml
@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.loki4j</groupId>
-            <artifactId>loki-logback-appender-jdk8</artifactId>
+            <artifactId>loki-logback-appender</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/mica-logging/src/main/java/net/dreamlu/mica/logging/loki/Loki4jOkHttpClient.java b/mica-logging/src/main/java/net/dreamlu/mica/logging/loki/Loki4jOkHttpClient.java
@@ -17,7 +17,7 @@
 package net.dreamlu.mica.logging.loki;
 
 import com.github.loki4j.client.http.HttpConfig;
-import com.github.loki4j.client.http.HttpHeaders;
+import com.github.loki4j.client.http.HttpHeader;
 import com.github.loki4j.client.http.Loki4jHttpClient;
 import com.github.loki4j.client.http.LokiResponse;
 import okhttp3.*;
@@ -57,9 +57,9 @@ private static OkHttpClient okHttpClientBuilder(HttpConfig conf) {
 	private static Request requestBuilder(HttpConfig conf) {
 		Request.Builder request = new Request.Builder()
 			.url(conf.pushUrl)
-			.addHeader(HttpHeaders.CONTENT_TYPE, conf.contentType);
-		conf.tenantId.ifPresent(tenant -> request.addHeader(HttpHeaders.X_SCOPE_ORGID, tenant));
-		conf.basicAuthToken().ifPresent(token -> request.addHeader(HttpHeaders.AUTHORIZATION, "Basic " + token));
+			.addHeader(HttpHeader.CONTENT_TYPE, conf.contentType);
+		conf.tenantId.ifPresent(tenant -> request.addHeader(HttpHeader.X_SCOPE_ORGID, tenant));
+		conf.basicAuthToken().ifPresent(token -> request.addHeader(HttpHeader.AUTHORIZATION, "Basic " + token));
 		return request.build();
 	}
 

diff --git a/pom.xml b/pom.xml
@@ -198,7 +198,7 @@
             </dependency>
             <dependency>
                 <groupId>com.github.loki4j</groupId>
-                <artifactId>loki-logback-appender-jdk8</artifactId>
+                <artifactId>loki-logback-appender</artifactId>
                 <version>${loki.logback.appender.version}</version>
             </dependency>
             <!-- mica 相关 -->
@@ -433,6 +433,12 @@
                     </releases>
                 </repository>
             </repositories>
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>aliyun-plugin</id>
+                    <url>https://maven.aliyun.com/repository/public</url>
+                </pluginRepository>
+            </pluginRepositories>
         </profile>
         <profile>
             <id>release</id>